From 6f4b2e7f5ce685c069694e0314882455471446a0 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Sun, 5 Jun 2016 23:05:17 +0000 Subject: [PATCH] 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 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 7fc5ae1bdefc..b46d99e5b1a3 100644 --- a/Makefile +++ b/Makefile @@ -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 +.endif # Note: we use this awkward construct to be compatible with FreeBSD's # old make used in 10.0 and 9.2 and earlier.