Without this, they don't build with clang++ because it tries to use
the installed headers.  Doesn't hurt building with eg++.

ok?


Index: lib/libcxx/Makefile
===================================================================
RCS file: /cvs/src/lib/libcxx/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- lib/libcxx/Makefile 4 Sep 2016 12:48:33 -0000       1.1
+++ lib/libcxx/Makefile 17 Sep 2016 22:09:30 -0000
@@ -41,7 +41,7 @@ SRCS+=                algorithm.cpp\
 
 CPPFLAGS+=     -DLIBCXXABI -I${HDRDIR} \
                -DLIBCXX_BUILDING_LIBCXXABI -I${AHDRDIR} -I${UHDRDIR}
-CXXFLAGS+=     -nostdlib
+CXXFLAGS+=     -nostdlib -nostdinc++
 .if empty(CXXFLAGS:M-std=*)
 CXXFLAGS+=     -std=c++11
 .endif
Index: lib/libcxxabi/Makefile
===================================================================
RCS file: /cvs/src/lib/libcxxabi/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- lib/libcxxabi/Makefile      4 Sep 2016 12:48:34 -0000       1.1
+++ lib/libcxxabi/Makefile      17 Sep 2016 22:09:30 -0000
@@ -39,7 +39,7 @@ SRCS+=                abort_message.cpp\
                libunwind.cpp
 
 CPPFLAGS+=     -I${SHDRDIR} -I${HDRDIR} -I${UHDRDIR}
-CXXFLAGS+=     -nostdlib -funwind-tables
+CXXFLAGS+=     -nostdlib -nostdinc++ -funwind-tables
 .if empty(CXXFLAGS:M-std=*)
 CXXFLAGS+=     -std=c++11
 .endif

Reply via email to