aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2021-12-29 19:50:03 +0000
committerEd Maste <emaste@FreeBSD.org>2021-12-29 19:51:28 +0000
commit6b1c5775d1c29c7c42201254df82aca9f3820bc8 (patch)
tree30380dcebc89cce8fa1c0d430652b0f768242866
parent8119cdd38b4f3ebdba92d8d0658fabbc04a1f238 (diff)
downloadsrc-6b1c5775d1c2.tar.gz
src-6b1c5775d1c2.zip
Move libc++ from /usr/lib to /lib
As with other runtime components like libc or libcxxrt. If desired we can stop linking devd statically after this change (to achive approximately no net change in required root filesystem size). Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33123
-rw-r--r--ObsoleteFiles.inc3
-rw-r--r--lib/libc++/Makefile1
2 files changed, 4 insertions, 0 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 4e99c917e89a..6207ad302bba 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -40,6 +40,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20211229 libc++ moved to /lib
+OLD_LIBS+=usr/lib/libc++.so.1
+
# 20211221 efi_set_variables_supported.3 should be efi_variables_supported.3
OLD_FILES+=usr/share/man/man3/efi_set_variables_supported.3.gz
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index 2bc1bf40eccd..f535a0cfba8c 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -3,6 +3,7 @@
.include <src.opts.mk>
PACKAGE= clibs
+SHLIBDIR?= /lib
_LIBCXXRTDIR= ${SRCTOP}/contrib/libcxxrt
HDRDIR= ${SRCTOP}/contrib/llvm-project/libcxx/include
SRCDIR= ${SRCTOP}/contrib/llvm-project/libcxx/src