mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
Fix libcompat not handling some external toolchain flags.
- Use libc++ with GCC. - Use CROSS_BINUTILS_PREFIX with -B (r280980 addressed this mostly already) Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
parent
1b89301d3b
commit
17e3ebb1ad
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=297272
|
@ -52,7 +52,8 @@ LIBSOFTWMAKEFLAGS= -DCOMPAT_SOFTFP
|
||||||
# Generic code for each type.
|
# Generic code for each type.
|
||||||
# Set defaults based on type.
|
# Set defaults based on type.
|
||||||
libcompat= ${LIBCOMPAT:tl}
|
libcompat= ${LIBCOMPAT:tl}
|
||||||
_LIBCOMPAT_MAKEVARS= _OBJTREE TMP CPUFLAGS CFLAGS WMAKEENV WMAKEFLAGS WMAKE
|
_LIBCOMPAT_MAKEVARS= _OBJTREE TMP CPUFLAGS CFLAGS CXXFLAGS WMAKEENV \
|
||||||
|
WMAKEFLAGS WMAKE
|
||||||
.for _var in ${_LIBCOMPAT_MAKEVARS}
|
.for _var in ${_LIBCOMPAT_MAKEVARS}
|
||||||
.if !empty(LIB${LIBCOMPAT}${_var})
|
.if !empty(LIB${LIBCOMPAT}${_var})
|
||||||
LIBCOMPAT${_var}?= ${LIB${LIBCOMPAT}${_var}}
|
LIBCOMPAT${_var}?= ${LIB${LIBCOMPAT}${_var}}
|
||||||
|
@ -65,7 +66,8 @@ LIBCOMPATTMP?= ${OBJTREE}${.CURDIR}/lib${libcompat}
|
||||||
|
|
||||||
LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \
|
LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \
|
||||||
-L${LIBCOMPATTMP}/usr/lib${libcompat} \
|
-L${LIBCOMPATTMP}/usr/lib${libcompat} \
|
||||||
--sysroot=${LIBCOMPATTMP}
|
--sysroot=${LIBCOMPATTMP} \
|
||||||
|
${BFLAGS}
|
||||||
|
|
||||||
# -B is needed to find /usr/lib32/crti.o for GCC and /usr/libsoft/crti.o for
|
# -B is needed to find /usr/lib32/crti.o for GCC and /usr/libsoft/crti.o for
|
||||||
# Clang/GCC.
|
# Clang/GCC.
|
||||||
|
@ -73,6 +75,12 @@ LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat}
|
||||||
# GCC requires -isystem when using a cross-compiler.
|
# GCC requires -isystem when using a cross-compiler.
|
||||||
LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include
|
LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include
|
||||||
|
|
||||||
|
.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
|
||||||
|
# Force using libc++ for external GCC.
|
||||||
|
LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
|
||||||
|
-nostdinc++ -L${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc++
|
||||||
|
.endif
|
||||||
|
|
||||||
# Yes, the flags are redundant.
|
# Yes, the flags are redundant.
|
||||||
LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \
|
LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \
|
||||||
INSTALL="sh ${.CURDIR}/tools/install.sh" \
|
INSTALL="sh ${.CURDIR}/tools/install.sh" \
|
||||||
|
@ -81,7 +89,7 @@ LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \
|
||||||
SHLIBDIR=/usr/lib${libcompat} \
|
SHLIBDIR=/usr/lib${libcompat} \
|
||||||
DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}"
|
DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}"
|
||||||
LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
|
LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
|
||||||
CXX="${XCXX} ${LIBCOMPATCFLAGS}" \
|
CXX="${XCXX} ${LIBCOMPATCFLAGS} ${LIBCOMPATCXXFLAGS}" \
|
||||||
DESTDIR=${LIBCOMPATTMP} \
|
DESTDIR=${LIBCOMPATTMP} \
|
||||||
-DNO_CPU_CFLAGS \
|
-DNO_CPU_CFLAGS \
|
||||||
MK_CTF=no \
|
MK_CTF=no \
|
||||||
|
|
Loading…
Reference in a new issue