diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-08-31 19:30:00 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-08-31 19:30:00 +0000 |
| commit | 790ba09ec61dd78b46bb2175eba0e1db198eaf6e (patch) | |
| tree | f12040a35778928c69ba74ed5c1a40ef0c74e63f /gnu/lib | |
| parent | e1ec67bbc99a3c01ed02f565483cef06ccb11166 (diff) | |
| download | src-790ba09ec61dd78b46bb2175eba0e1db198eaf6e.tar.gz src-790ba09ec61dd78b46bb2175eba0e1db198eaf6e.zip | |
DIRDEPS_BUILD: Avoid cyclic dependency with libc++.
The DIRDEPS_BUILD does not have a 'make includes' phase, so it would
otherwise want libc++ to be fully built/staged before building
libgcc. Using the header directly works.
MFC after: 3 days
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=305145
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/libgcc/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index a47bd3389420..d9837cc3a7cd 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -95,6 +95,10 @@ CXXFLAGS+= -std=c++11 .endif CXXFLAGS+= -fno-rtti STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC +.if ${MK_DIRDEPS_BUILD} == "yes" +# Avoid dependency on lib/libc++ +CFLAGS+= -I${SRCTOP}/contrib/libc++/include +.endif .else # MK_LLVM_LIBUNWIND |