diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-08-07 16:23:53 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-08-07 16:23:53 +0000 |
| commit | 8422e09e55953a2c21698dcddb0e0b3436f80d85 (patch) | |
| tree | e2a232c288568f6a52a89cb720b267847ff03e33 /Makefile.libcompat | |
| parent | e1cf70fbabf983bb355fb336822bfb8c98e832b0 (diff) | |
| download | src-8422e09e55953a2c21698dcddb0e0b3436f80d85.tar.gz src-8422e09e55953a2c21698dcddb0e0b3436f80d85.zip | |
Follow-up to r321684 (Don't use libc++ when cross-building for gcc
arches), and handle two more cases where libc++ includes could be
incorrectly enabled, in case the host compiler is clang 5.0.0, and the
target (cross) compiler is gcc 4.2.1.
Noted by: bdrewery
MFC after: 3 days
X-MFC-With: 321684
Notes
Notes:
svn path=/head/; revision=322170
Diffstat (limited to 'Makefile.libcompat')
| -rw-r--r-- | Makefile.libcompat | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat index 3c0aabb2d05f..8542d5b246ae 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -99,8 +99,7 @@ LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat} # sysroot path which --sysroot does not actually do for headers. LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include # Force using libc++ for external GCC. -# XXX: This should be checking MK_GNUCXX == no -.if ${X_COMPILER_VERSION} >= 40800 && \ +.if ${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++ |