diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-05-27 23:03:44 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-05-27 23:03:44 +0000 |
| commit | 288155afbb54ee396ff0a06ce1284ae765bca009 (patch) | |
| tree | 0cfea6e3ddff242088e35731cabddb495ceb3e37 /Makefile.libcompat | |
| parent | b945f26dce90425126b84cb6da21090a3b54d785 (diff) | |
| download | FreeBSD-src-288155afbb54ee396ff0a06ce1284ae765bca009.zip FreeBSD-src-288155afbb54ee396ff0a06ce1284ae765bca009.tar.gz | |
Move external GCC compiler hacks to bsd.sys.mk.
This allows respecting -nostdinc, -nostdinc++ and -nostdlib before
making the decision to add in -isystem, etc. The -isystem flags
are problematic for building lib/libc++ and lib/libcxxrt which wants
to only use its own headers.
More information the need of these flags can be found at
https://gcc.gnu.org/ml/gcc/2016-03/msg00219.html
This also reverts r300873.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'Makefile.libcompat')
| -rw-r--r-- | Makefile.libcompat | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat index c966234..08d684c 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -72,13 +72,6 @@ LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \ # -B is needed to find /usr/lib32/crti.o for GCC and /usr/libsoft/crti.o for # Clang/GCC. LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat} -.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc -# GCC requires -isystem when using a cross-compiler. -LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include -# Force using libc++ for external GCC. -LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \ - -nostdinc++ -L${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc++ -.endif # Yes, the flags are redundant. LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \ |
