svn commit: r297435 - head

[Bryan Drewery]

Author: bdrewery
Date: Wed Mar 30 23:50:29 2016
New Revision: 297435
URL: https://svnweb.freebsd.org/changeset/base/297435

Log:
  Fix the external GCC build after r297271 by setting -L <sysroot>/usr/lib.
  
  GCC does add <sysroot>/usr/lib to the library search path but it comes after
  /usr/local/lib which can find ports libraries such as libedit.so.  The
  bad path comes in as /usr/local/lib/gcc/x86_64-portbld-freebsd11.0/5.3.0/../../../
  which corresponds to <prefix>/lib.
  
  This partially reverts r297271.
  
  Pointyhat to:	bdrewery
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Mar 30 23:50:23 2016	(r297434)
+++ head/Makefile.inc1	Wed Mar 30 23:50:29 2016	(r297435)
@@ -421,8 +421,8 @@ TARGET_ABI=	gnueabi
 .endif
 .endif
 .if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
-# GCC requires -isystem when using a cross-compiler.
-XCFLAGS+=	-isystem ${WORLDTMP}/usr/include
+# GCC requires -isystem and -L when using a cross-compiler.
+XCFLAGS+=	-isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
 # Force using libc++ for external GCC.
 XCXXFLAGS+=	-isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \
 		-nostdinc++ -L${WORLDTMP}/../lib/libc++