diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-05-21 01:32:07 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-05-21 01:32:07 +0000 |
| commit | 3aeb27eae3e3930d2099babf8f28060a7a6644dc (patch) | |
| tree | e8e78ef5a834a98695e010d43b0a5a9014c476b7 | |
| parent | 3c05e2ccc25e519b52d5c8b04f4fc30b5c9732c3 (diff) | |
| download | FreeBSD-src-3aeb27eae3e3930d2099babf8f28060a7a6644dc.zip FreeBSD-src-3aeb27eae3e3930d2099babf8f28060a7a6644dc.tar.gz | |
Enable and utilize WITHOUT_CROSS_COMPILER logic for external CC.
This is a NOP.
Reviewed by: brooks, bapt
Sponsored by: EMC / Isilon Storage Division
Differential Revision: https://reviews.freebsd.org/D6354
| -rw-r--r-- | Makefile.inc1 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 4dc6055..e44182f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -91,6 +91,12 @@ X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}} X${BINUTIL}?= ${${BINUTIL}} .endif .endfor +# If a full path to an external cross compiler is given, don't build +# a cross compiler. +.if ${XCC:N${CCACHE_BIN}:M/*} +MK_CROSS_COMPILER= no +.endif + .include <bsd.compiler.mk> # don't depend on src.opts.mk doing it .include "share/mk/src.opts.mk" @@ -454,7 +460,7 @@ BFLAGS+= -B${CROSS_BINUTILS_PREFIX} .endif # External compiler needs sysroot and target flags. -.if ${XCC:N${CCACHE_BIN}:M/*} || ${MK_CROSS_COMPILER} == "no" +.if ${MK_CROSS_COMPILER} == "no" .if !defined(CROSS_BINUTILS_PREFIX) || !exists(${CROSS_BINUTILS_PREFIX}) BFLAGS+= -B${WORLDTMP}/usr/bin .endif @@ -478,7 +484,7 @@ XCFLAGS+= -target ${TARGET_TRIPLE} .endif XCFLAGS+= --sysroot=${WORLDTMP} .else -.endif # ${XCC:M/*} || ${MK_CROSS_COMPILER} == "no" +.endif # ${MK_CROSS_COMPILER} == "no" .if !empty(BFLAGS) XCFLAGS+= ${BFLAGS} @@ -1714,9 +1720,7 @@ _elftctools= lib/libelftc \ usr.bin/elfcopy .endif -# If an full path to an external cross compiler is given, don't build -# a cross compiler. -.if ${XCC:N${CCACHE_BIN}:M/*} == "" && ${MK_CROSS_COMPILER} != "no" +.if ${MK_CROSS_COMPILER} != "no" .if ${MK_CLANG_BOOTSTRAP} != "no" _clang= usr.bin/clang _clang_libs= lib/clang |
