mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
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
This commit is contained in:
parent
e1cf70fbab
commit
8422e09e55
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=322170
|
@ -2742,8 +2742,7 @@ CD2CFLAGS+= -isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib
|
||||||
# combined with --sysroot.
|
# combined with --sysroot.
|
||||||
CD2CFLAGS+= -B${XDDESTDIR}/usr/lib
|
CD2CFLAGS+= -B${XDDESTDIR}/usr/lib
|
||||||
# Force using libc++ for external GCC.
|
# Force using libc++ for external GCC.
|
||||||
# XXX: This should be checking MK_GNUCXX == no
|
.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800
|
||||||
.if ${X_COMPILER_VERSION} >= 40800
|
|
||||||
CD2CXXFLAGS+= -isystem ${XDDESTDIR}/usr/include/c++/v1 -std=c++11 \
|
CD2CXXFLAGS+= -isystem ${XDDESTDIR}/usr/include/c++/v1 -std=c++11 \
|
||||||
-nostdinc++
|
-nostdinc++
|
||||||
.endif
|
.endif
|
||||||
|
|
|
@ -99,8 +99,7 @@ LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat}
|
||||||
# sysroot path which --sysroot does not actually do for headers.
|
# sysroot path which --sysroot does not actually do for headers.
|
||||||
LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include
|
LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include
|
||||||
# Force using libc++ for external GCC.
|
# Force using libc++ for external GCC.
|
||||||
# XXX: This should be checking MK_GNUCXX == no
|
.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 && \
|
||||||
.if ${X_COMPILER_VERSION} >= 40800 && \
|
|
||||||
(${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no")
|
(${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no")
|
||||||
LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
|
LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
|
||||||
-nostdinc++
|
-nostdinc++
|
||||||
|
|
Loading…
Reference in a new issue