Page MenuHomeFreeBSD
Files F147593900

D6354.id16309.diff
No OneTemporary
Actions

D6354.id16309.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -91,6 +91,12 @@
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"
@@ -455,7 +461,7 @@
.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
@@ -479,7 +485,7 @@
.endif
XCFLAGS+= --sysroot=${WORLDTMP}
.else
-.endif # ${XCC:M/*} || ${MK_CROSS_COMPILER} == "no"
+.endif # ${MK_CROSS_COMPILER} == "no"
.if !empty(BFLAGS)
XCFLAGS+= ${BFLAGS}
@@ -1723,9 +1729,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 13, 4:55 AM (8 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29609375
Default Alt Text
D6354.id16309.diff (1 KB)

Event Timeline