git: b6f7942cbcbd - main - Revert "Move libc++ from /usr/lib to /lib"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 30 Dec 2021 15:26:45 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=b6f7942cbcbde7c09788e86fdfe9310eafcb6e9f
commit b6f7942cbcbde7c09788e86fdfe9310eafcb6e9f
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-12-30 15:25:08 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-12-30 15:25:58 +0000
Revert "Move libc++ from /usr/lib to /lib"
This reverts commit 6b1c5775d1c29c7c42201254df82aca9f3820bc8.
There are reports of errors with this change.
Reported by: antoine
---
ObsoleteFiles.inc | 3 ---
lib/libc++/Makefile | 1 -
2 files changed, 4 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 6207ad302bba..4e99c917e89a 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -40,9 +40,6 @@
# 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 f535a0cfba8c..2bc1bf40eccd 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -3,7 +3,6 @@
.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