d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

External GCC: Ensure our libstdc++ symlink to libc++ is found.

Browse Source 
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.
This commit is contained in:
Bryan Drewery 2016-05-29 00:10:23 +00:00
parent c3c4167236
commit 727dd78afa
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=300918
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/mk/bsd.sys.mk
View File

@ -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