svn commit: r458059 - branches/2018Q1/Mk

[Bryan Drewery]

Author: bdrewery
Date: Thu Jan  4 20:06:48 2018
New Revision: 458059
URL: https://svnweb.freebsd.org/changeset/ports/458059

Log:
  MFH: r458058
  
  Follow-up r458048: Properly trim FLAVOR from .MAKEOVERRIDES.
  
  The code I removed was wrong but it still achieved the proper effect of
  removing FLAVOR from .MAKEOVERRIDES.  This is still needed and now is
  done properly without truncating away all of the other valuable variables.
  
  Pointyhat to:	bdrewery
  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:06:21 2018	(r458058)
+++ branches/2018Q1/Mk/bsd.port.mk	Thu Jan  4 20:06:48 2018	(r458059)
@@ -1081,6 +1081,9 @@ _PORTS_DIRECTORIES+=	${PKG_DBDIR} ${PREFIX} ${WRKDIR} 
 
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
+# Do not leak flavors to childs make
+.MAKEOVERRIDES:=	${.MAKEOVERRIDES:NFLAVOR}
+
 .if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
 _DID_FLAVORS_HELPERS=	yes
 _FLAVOR_HELPERS_OVERRIDE=	DESCR PLIST PKGNAMEPREFIX PKGNAMESUFFIX