D14241.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D14241.diff
View Options

	Index: head/Makefile
	===================================================================
	--- head/Makefile
	+++ head/Makefile
	@@ -106,9 +106,13 @@
	#

	# This is included so CC is set to ccache for -V, and COMPILER_TYPE/VERSION
	-# can be cached for sub-makes.
	+# can be cached for sub-makes. We can't do this while still running on the
	+# old fmake from FreeBSD 9.x or older, so avoid including it then to avoid
	+# heartburn upgrading from older systems. The need for CC is done with new
	+# make later in the build, and caching COMPILER_TYPE/VERSION is only an
	+# optimization. Also sinclude it to be friendlier to foreign OS hosted builds.
	.if ${MAKE_VERSION} >= 20140620 && defined(.PARSEDIR)
	-.include <bsd.compiler.mk>
	+.sinclude <bsd.compiler.mk>
	.endif

	# Note: we use this awkward construct to be compatible with FreeBSD's
	Index: head/Makefile.inc1
	===================================================================
	--- head/Makefile.inc1
	+++ head/Makefile.inc1
	@@ -85,8 +85,10 @@
	.-include "${OBJTOP}/compiler-metadata.mk"
	.endif

	-# Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early.
	-.include <bsd.compiler.mk>
	+# Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early. Pull it from the
	+# tree to be friendlier to foreign OS builds. It's safe to do so unconditionally
	+# here since we will always have the right make, unlike in src/Makefile
	+.include "share/mk/bsd.compiler.mk"
	.include "share/mk/src.opts.mk"

	# Check if there is a local compiler that can satisfy as an external compiler.