git: 2b8331622f0b - main - Fix DIRDEPS_BUILD for libgcc_eh
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 14 Apr 2023 23:57:19 UTC
The branch main has been updated by sjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=2b8331622f0b212cf3bb4fc4914a501e5321d506
commit 2b8331622f0b212cf3bb4fc4914a501e5321d506
Author: Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2023-04-14 23:56:30 +0000
Commit: Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2023-04-14 23:56:30 +0000
Fix DIRDEPS_BUILD for libgcc_eh
---
lib/libbearssl/Makefile.depend | 1 -
lib/libgcc_eh/Makefile.inc | 6 ++++++
lib/libssp_nonshared/Makefile.depend | 12 ++++++++++++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/lib/libbearssl/Makefile.depend b/lib/libbearssl/Makefile.depend
index 6cfaab1c3644..8d409f5263ac 100644
--- a/lib/libbearssl/Makefile.depend
+++ b/lib/libbearssl/Makefile.depend
@@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc
index 08e5db419840..c48b15412c42 100644
--- a/lib/libgcc_eh/Makefile.inc
+++ b/lib/libgcc_eh/Makefile.inc
@@ -43,4 +43,10 @@ STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
.if ${MK_DIRDEPS_BUILD} == "yes"
# Avoid dependency on lib/libc++
CFLAGS+= -isystem ${SRCTOP}/contrib/llvm-project/libcxx/include -nostdinc++
+
+# we need this for __config_site
+CFLAGS+= -I${SRCTOP}/lib/libc++
+.if ${.MAKE.LEVEL} > 0
+GENDIRDEPS_FILTER+= Nlib/libc++
+.endif
.endif
diff --git a/lib/libssp_nonshared/Makefile.depend b/lib/libssp_nonshared/Makefile.depend
new file mode 100644
index 000000000000..79506ce16b79
--- /dev/null
+++ b/lib/libssp_nonshared/Makefile.depend
@@ -0,0 +1,12 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ include \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif