From owner-svn-src-all@freebsd.org  Sun May 29 00:10:25 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A39AB4ED42;
 Sun, 29 May 2016 00:10:25 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F053E16A7;
 Sun, 29 May 2016 00:10:24 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4T0AOno060627;
 Sun, 29 May 2016 00:10:24 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4T0AOYU060626;
 Sun, 29 May 2016 00:10:24 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201605290010.u4T0AOYU060626@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 29 May 2016 00:10:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300918 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 May 2016 00:10:25 -0000

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