diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-06-29 01:50:30 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-06-29 01:50:30 +0000 |
| commit | 1e1f5317b73b45be67126beb4388fb4e8d6a6649 (patch) | |
| tree | 45578dd696c1591e61bc21c9e5c4a68a08c17700 /Makefile.libcompat | |
| parent | 8c8129e2bd32aa12f7531eeb6dd4a77fe81b715e (diff) | |
| download | FreeBSD-src-1e1f5317b73b45be67126beb4388fb4e8d6a6649.zip FreeBSD-src-1e1f5317b73b45be67126beb4388fb4e8d6a6649.tar.gz | |
WITH_SYSTEM_COMPILER: Avoid using GCC4.8+ logic on native GCC4.2 platforms.
As the XXX notes, these should really be checking MK_GNUCXX since there is
already a version check in share/mk/src.opts.mk to disable it. Fixing that
here is more complex though. This could also be using X_COMPILER_FEATURES
but uses X_COMPILER_VERSION to keep in sync with the src.opts.mk logic.
Tested by: andreast
Sponsored by: EMC / Isilon Storage Division
Approved by: re (gjb)
Diffstat (limited to 'Makefile.libcompat')
| -rw-r--r-- | Makefile.libcompat | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat index 4b923bb..3182c8c 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -81,8 +81,8 @@ LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat} LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include # Force using libc++ for external GCC. # XXX: This should be checking MK_GNUCXX == no -.if ${MK_CROSS_COMPILER} == "no" || \ - (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no") +.if ${X_COMPILER_VERSION} >= 40800 && (${MK_CROSS_COMPILER} == "no" || \ + (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no")) LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \ -nostdinc++ -L${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc++ .endif |
