d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore the ability to use clang as an external compiler. This was

Browse Source 
inadvertently removed when support for external GCC was added.

Deprecate XFLAGS in favour of the newer XCFLAGS/XCXXFLAGS.

Tested with:	make universe, make CROSS_COMPILER_PREFIX=/usr/bin/ buildworld
Reviewed by:	imp, bapt
This commit is contained in:
Peter Grehan 2015-02-18 19:27:51 +00:00
parent e8577fb489
commit 784b6cd5e9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.inc1
View File

@ -343,16 +343,15 @@ WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \
SIZE="${XSIZE}" SIZE="${XSIZE}"
.if ${XCC:M/*} .if ${XCC:M/*}
XFLAGS= --sysroot=${WORLDTMP}
.if defined(CROSS_BINUTILS_PREFIX) .if defined(CROSS_BINUTILS_PREFIX)
# In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a
# directory, but the compiler will look in the right place for it's # directory, but the compiler will look in the right place for it's
# tools so we don't need to tell it where to look. # tools so we don't need to tell it where to look.
.if exists(${CROSS_BINUTILS_PREFIX}) .if exists(${CROSS_BINUTILS_PREFIX})
XFLAGS+= -B${CROSS_BINUTILS_PREFIX} BFLAGS+= -B${CROSS_BINUTILS_PREFIX}
.endif .endif
.else .else
XFLAGS+= -B${WORLDTMP}/usr/bin BFLAGS+= -B${WORLDTMP}/usr/bin
.endif .endif
.if ${TARGET} == "arm" .if ${TARGET} == "arm"
.if ${TARGET_ARCH:M*hf*} != "" .if ${TARGET_ARCH:M*hf*} != ""
@ -369,6 +368,8 @@ DEPFLAGS+= -I${WORLDTMP}/usr/include/c++/v1
TARGET_ABI?= unknown TARGET_ABI?= unknown
TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
XCFLAGS+= -target ${TARGET_TRIPLE} XCFLAGS+= -target ${TARGET_TRIPLE}
XCFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS}
XCXXFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS}
.endif .endif
.endif .endif