From 727dd78afafcdddb4fdd53b9d6a4b99308221dba Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Sun, 29 May 2016 00:10:23 +0000 Subject: [PATCH] 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. --- share/mk/bsd.sys.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 9682a99a96b..ab7cb534c8f 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -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