svn commit: r458083 - head/Mk
Bryan Drewery
bdrewery at FreeBSD.org
Thu Jan 4 20:17:42 UTC 2018
Author: bdrewery
Date: Thu Jan 4 20:17:40 2018
New Revision: 458083
URL: https://svnweb.freebsd.org/changeset/ports/458083
Log:
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)
MFH: 2018Q1
Modified:
head/Mk/bsd.port.mk
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Thu Jan 4 20:17:09 2018 (r458082)
+++ head/Mk/bsd.port.mk Thu Jan 4 20:17:40 2018 (r458083)
@@ -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}
More information about the svn-ports-head
mailing list