svn commit: r300918 - head/share/mk
Bryan Drewery
bdrewery at FreeBSD.org
Sun May 29 00:10:25 UTC 2016
Author: bdrewery
Date: Sun May 29 00:10:23 2016
New Revision: 300918
URL: https://svnweb.freebsd.org/changeset/base/300918
Log:
External GCC: Ensure our libstdc++ symlink to libc++ is found.
Similar to r300917, the search path for our symlink hack must come
before the =/usr/lib search path.
This fixes the atf-check build after r300886.
Modified:
head/share/mk/bsd.sys.mk
Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk Sat May 28 23:10:07 2016 (r300917)
+++ head/share/mk/bsd.sys.mk Sun May 29 00:10:23 2016 (r300918)
@@ -190,9 +190,6 @@ CXXFLAGS+= ${CXXFLAGS.${.IMPSRC:T}}
.if ${CFLAGS:M-nostdinc} == ""
CFLAGS+= -isystem =/usr/include
.endif
-# Add in sysroot/usr/lib to ensure that it comes before /usr/local/lib
-# from ports compilers.
-LDFLAGS+= -L=/usr/lib
# We want to force building the system with our in-tree libc++. Note that
# this also requires a symlink in OBJDIR/lib/libc++/libstdc++.so to
# sysroot/usr/lib/libc++.so.
@@ -205,6 +202,9 @@ CXXFLAGS+= -std=c++11 \
CXX+= -isystem =/usr/include/c++/v1
LDFLAGS+= -L${OBJTOP}/lib/libc++
.endif
+# Add in sysroot/usr/lib to ensure that it comes before /usr/local/lib
+# from ports compilers.
+LDFLAGS+= -L=/usr/lib
.endif # --sysroot
.endif # X_COMPILER_TYPE == gcc
More information about the svn-src-head
mailing list