D4087.id9965.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D4087.id9965.diff
View Options

	Index: Makefile.inc1
	===================================================================
	--- Makefile.inc1
	+++ Makefile.inc1
	@@ -48,9 +48,15 @@
	.error "Both TARGET and TARGET_ARCH must be defined."
	.endif

	-.include "share/mk/src.opts.mk"
	-.include <bsd.arch.inc.mk>
	-.include <bsd.compiler.mk>
	+# Cross toolchain changes must be in effect before bsd.compiler.mk
	+# so that gets the right CC.
	+.if defined(CROSS_TOOLCHAIN)
	+LOCALBASE?= /usr/local
	+.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
	+CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}"
	+.endif
	+.include <bsd.compiler.mk> # don't depend on src.opts.mk doing it
	+.include "share/mk/src.opts.mk"

	# We must do lib/ and libexec/ before bin/ in case of a mid-install error to
	# keep the users system reasonably usable. For static->dynamic root upgrades,
	@@ -329,10 +335,6 @@
	HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT
	.endif

	-.if defined(CROSS_TOOLCHAIN)
	-LOCALBASE?= /usr/local
	-.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
	-.endif
	.if defined(CROSS_TOOLCHAIN_PREFIX)
	CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
	CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
	@@ -369,7 +371,7 @@
	X${BINUTIL}?= ${${BINUTIL}}
	.endif
	.endfor
	-WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \
	+CROSSENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \
	DEPFLAGS="${DEPFLAGS}" \
	CPP="${XCPP} ${XCFLAGS}" \
	AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \