Author: bdrewery Date: Sun Jun 5 23:05:17 2016 New Revision: 301472 URL: https://svnweb.freebsd.org/changeset/base/301472
Log: Only include bsd.compiler.mk for bmakes that use -m .../share/mk by default. Otherwise they error when trying to include the file, which also has its own dependencies. Sponsored by: EMC / Isilon Storage Division Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Sun Jun 5 23:05:14 2016 (r301471) +++ head/Makefile Sun Jun 5 23:05:17 2016 (r301472) @@ -103,7 +103,9 @@ # This is included so CC is set to ccache for -V, and COMPILER_TYPE/VERSION # can be cached for sub-makes. +.if ${MAKE_VERSION} >= 20140620 .include <bsd.compiler.mk> +.endif # Note: we use this awkward construct to be compatible with FreeBSD's # old make used in 10.0 and 9.2 and earlier. _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"