svn commit: r458084 - branches/2018Q1/Mk

[Bryan Drewery]

Author: bdrewery
Date: Thu Jan  4 20:18:03 2018
New Revision: 458084
URL: https://svnweb.freebsd.org/changeset/ports/458084

Log:
  MFH: r458083
  
  Disallow forced FLAVOR as make argument.
  
  This otherwise prevents properly setting FLAVOR to the default internally
  since it is in a separate namespace in bmake that is read-only.
  
  Approved by:	portmgr (implicit)

Modified:
  branches/2018Q1/Mk/bsd.port.mk
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/Mk/bsd.port.mk
==============================================================================
--- branches/2018Q1/Mk/bsd.port.mk	Thu Jan  4 20:17:40 2018	(r458083)
+++ branches/2018Q1/Mk/bsd.port.mk	Thu Jan  4 20:18:03 2018	(r458084)
@@ -1061,6 +1061,11 @@ STAGEDIR?=	${WRKDIR}/stage
 NOTPHONY?=
 FLAVORS?=
 FLAVOR?=
+# Disallow forced FLAVOR as make argument since we cannot change it to the
+# proper default.
+.if empty(FLAVOR) && !empty(.MAKEOVERRIDES:MFLAVOR)
+.error FLAVOR may not be passed empty as a make argument.
+.endif
 # Store env FLAVOR for later
 .if !defined(_FLAVOR)
 _FLAVOR:=	${FLAVOR}