git: dda9847275da - main - depend-cleanup.sh: Handle stale libc++.so ldscripts.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 30 Dec 2021 22:26:08 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=dda9847275da79ccbb2f0b7079b250e28b3b3b2a
commit dda9847275da79ccbb2f0b7079b250e28b3b3b2a
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2021-12-30 22:10:05 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2021-12-30 22:25:47 +0000
depend-cleanup.sh: Handle stale libc++.so ldscripts.
libc++ was moved from /usr/lib to /lib, but the libc++.so linker
script is not regenerated when the value of SHLIB changes.
Reported by: cy
---
tools/build/depend-cleanup.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index b6ad7701c32b..d2e31dab31be 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -78,3 +78,10 @@ fi
clean_dep cddl/lib/libspl atomic S
# 20211207 cbdec8db18b5 switch to libthr-friendly pdfork
clean_dep lib/libc pdfork S
+
+# 20211230 5e6a2d6eb220 libc++.so.1 path changed in ldscript
+if [ -e "$OBJTOP"/lib/libc++/libc++.ld ] && \
+ fgrep -q "/usr/lib/libc++.so" "$OBJTOP"/lib/libc++/libc++.ld; then
+ echo "Removing old libc++ linker script"
+ rm -f "$OBJTOP"/lib/libc++/libc++.ld
+fi