diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-03-30 23:50:29 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-03-30 23:50:29 +0000 |
| commit | 4dad3c9162748d9f5b5b40d872d26437f0618fee (patch) | |
| tree | b4041464d6bc9a1179826d9c3a133b499a47ea2d /Makefile.inc1 | |
| parent | 59f4cb814dffd0fdde3c6d489c893c2cb67f3fc2 (diff) | |
| download | FreeBSD-src-4dad3c9162748d9f5b5b40d872d26437f0618fee.zip FreeBSD-src-4dad3c9162748d9f5b5b40d872d26437f0618fee.tar.gz | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index acf739c..7c027a8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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++ |
