diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2017-03-03 21:46:30 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2017-03-03 21:46:30 +0000 |
commit | 40418c3c021f381ac83ab483156caed98393f792 (patch) | |
tree | 1f7d971df1605ffa20bb9ccba743ee027d882b52 /Makefile.inc1 | |
parent | 5c80c37a349e934e6330fe421920680822ccc17b (diff) | |
download | FreeBSD-src-40418c3c021f381ac83ab483156caed98393f792.zip FreeBSD-src-40418c3c021f381ac83ab483156caed98393f792.tar.gz |
MFC r313907:
xdev: Fix after libc++ update in r300873.
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 5be4d30..797140a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2461,10 +2461,25 @@ CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ TOOLS_PREFIX=${XDTP} -CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \ - --sysroot=${XDDESTDIR}/ -B${XDDESTDIR}/usr/libexec \ - -B${XDDESTDIR}/usr/bin -B${XDDESTDIR}/usr/lib -CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CFLAGS}" \ + +.if ${WANT_COMPILER_TYPE} == gcc || \ + (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) +# GCC requires -isystem and -L when using a cross-compiler. --sysroot +# won't set header path and -L is used to ensure the base library path +# is added before the port PREFIX library path. +CD2CFLAGS+= -isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib +# GCC requires -B to find /usr/lib/crti.o when using a cross-compiler +# combined with --sysroot. +CD2CFLAGS+= -B${XDDESTDIR}/usr/lib +# Force using libc++ for external GCC. +# XXX: This should be checking MK_GNUCXX == no +.if ${X_COMPILER_VERSION} >= 40800 +CD2CXXFLAGS+= -isystem ${XDDESTDIR}/usr/include/c++/v1 -std=c++11 \ + -nostdinc++ +.endif +.endif +CD2CFLAGS+= --sysroot=${XDDESTDIR}/ +CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CXXFLAGS} ${CD2CFLAGS}" \ CPP="${CPP} ${CD2CFLAGS}" \ MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} |