diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-05-29 06:20:15 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-05-29 06:20:15 +0000 |
| commit | b8787754e008b1f98793f25b9dc8eb6051c422e4 (patch) | |
| tree | 722a245536a8d4e54475044cc7b2e057a1ec771f /Makefile.inc1 | |
| parent | acc0b5542a72ccf66ecd9c3452c5448d94d964cf (diff) | |
| download | FreeBSD-src-b8787754e008b1f98793f25b9dc8eb6051c422e4.zip FreeBSD-src-b8787754e008b1f98793f25b9dc8eb6051c422e4.tar.gz | |
GCC External: Revert r300886, r300904, r300917, r300918
The fix in r300873 is mostly enough. A fix for lib32 will be
committed.separately.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index e5e29e7..2503da3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -527,7 +527,13 @@ TARGET_ABI= gnueabihf TARGET_ABI= gnueabi .endif .endif -.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == "clang" +.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc +# 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++ +.else TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XCFLAGS+= -target ${TARGET_TRIPLE} |
