diff options
author | John Baldwin <jhb@FreeBSD.org> | 2018-06-28 21:26:14 +0000 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2018-06-28 21:26:14 +0000 |
commit | 151578dc5fd3d547930b894c5fb03eb9a1b9001d (patch) | |
tree | 1843a5d6ed33bae2d7781256307c0ef253a82232 /Makefile.libcompat | |
parent | 9e28e9855f2f3638adeb82ec8b5840c518854022 (diff) | |
download | src-151578dc5fd3d547930b894c5fb03eb9a1b9001d.tar.gz src-151578dc5fd3d547930b894c5fb03eb9a1b9001d.zip |
Remove the various build flag hacks for GCC cross-compile.
The xtoolchain GCC packages have not required these flags since ports
commits r465416 and r466701. The in-tree GCC 4.2.1 has also been patched
in r335716 and r335717 to correctly honor --sysroot when looking for
includes and libraries.
Reviewed by: bdrewery
Sponsored by: DARPA / AFRL
Differential Revision: https://reviews.freebsd.org/D16055
Notes
Notes:
svn path=/head/; revision=335782
Diffstat (limited to 'Makefile.libcompat')
-rw-r--r-- | Makefile.libcompat | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat index 8d7b00047254..83c18397fa98 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -100,22 +100,6 @@ LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \ # Clang/GCC. LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat} -.if ${WANT_COMPILER_TYPE} == gcc || \ - (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) -# GCC requires -isystem when using a cross-compiler and --sysroot. Note that -# Makefile.inc1 only applies this with an external compiler but libcompat -# always does since even in-tree GCC 4.2 needs this to override the built-in -# sysroot path which --sysroot does not actually do for headers. -LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include -# Force using libc++ for external GCC. -.if defined(X_COMPILER_TYPE) && \ - ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 && \ - (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no") -LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \ - -nostdinc++ -.endif -.endif - # Yes, the flags are redundant. LIBCOMPATWMAKEENV+= \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ |