diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2018-01-05 04:06:21 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2018-01-05 04:06:21 +0800 |
| commit | 6668f150bd426f698d63ead5fadf897b21135d05 (patch) | |
| tree | 6caa674817e60013ac64978b449d8f8bf2d79e8d /Mk | |
| parent | 40505e8ca88c960350a8ef8e10f7ccf3279670d7 (diff) | |
| download | freebsd-ports-graphics-6668f150bd426f698d63ead5fadf897b21135d05.tar.gz freebsd-ports-graphics-6668f150bd426f698d63ead5fadf897b21135d05.tar.zst freebsd-ports-graphics-6668f150bd426f698d63ead5fadf897b21135d05.zip | |
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)
MFH: 2018Q1
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index accc963769c..ebe4e9ba0b2 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1081,6 +1081,9 @@ _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 |