diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2018-01-05 03:18:48 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2018-01-05 03:18:48 +0800 |
| commit | 7e14f16cb222b14545c433a3e2da50aba26c06fc (patch) | |
| tree | 6070a9cc8abbecc79fac0f8f3a2868b0765def4e /Mk | |
| parent | de0714ea11a1df14410839b7851dff71b6ec7f2a (diff) | |
| download | freebsd-ports-gnome-7e14f16cb222b14545c433a3e2da50aba26c06fc.tar.gz freebsd-ports-gnome-7e14f16cb222b14545c433a3e2da50aba26c06fc.tar.zst freebsd-ports-gnome-7e14f16cb222b14545c433a3e2da50aba26c06fc.zip | |
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
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 3 |
1 files changed, 0 insertions, 3 deletions
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 |