From 0f12fc7d3275696bf8e6d28bfc1384770f213a49 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Thu, 4 Jan 2018 19:18:48 +0000 Subject: Stop truncating .MAKEOVERRIDES after the FLAVORS work. There is no such variable as ${MAKEOVERRIDES}, only ${.MAKEOVERRIDES}, so this code was simply truncating .MAKEOVERRIDES entirely which could cause performance and other odd issues with OSREL and make recursion. We don't want to leak FLAVOR to child sub-makes but that can be fixed later; this code was not doing what it intended. Approved by: portmgr (implicit) MFH: 2018Q1 --- Mk/bsd.port.mk | 3 --- 1 file changed, 3 deletions(-) (limited to 'Mk/bsd.port.mk') diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 6ad80888a9da..f9070030e8d3 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1081,9 +1081,6 @@ _PORTS_DIRECTORIES+= ${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_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 -- cgit v1.2.3