From fbd0c28059e00c23cef712e936e095a3788826ba Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 10 Feb 2011 19:58:21 +0000 Subject: [PATCH] You are now *REQUIRED* to pass both TARGET and TARGET_ARCH to any invocations of Makefile.inc1 (since that's supposed to be an internal interface for world and related targets). Document this with a .error message. For a transition period, support passing in just TARGET, but give a .warning for that case: I plan on removing it in 9.0... --- Makefile.inc1 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 06d6951c91d2..0fd7e240d133 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -28,6 +28,17 @@ # /usr/share/mk. These include: # obj depend all install clean cleandepend cleanobj +# You are supposed to define both of these when calling Makefile.inc1 +# directly. However, some old scripts don't. Cope for the moment, but +# issue a new warning for a transition period. +.if defined(TARGET) && !defined(TARGET_ARCH) +.warning "You must pass both TARGET and TARGET_ARCH to Makefile.inc1. Setting TARGET_ARCH=${TARGET}." +TARGET_ARCH=${TARGET} +.endif +.if !defined(TARGET) || !defined(TARGET_ARCH) +.error "Both TARGET and TARGET_ARCH must be defined." +.endif + .include .include