diff options
| author | jmc <jmc> | 2003-08-04 21:06:47 +0000 |
|---|---|---|
| committer | jmc <jmc> | 2003-08-04 21:06:47 +0000 |
| commit | cd7a2cab89aaeb9c468889b17290fd885bfa9cdc (patch) | |
| tree | a09ac76275d01bf8008fda96ec50bd9dbe99c692 /mk | |
| parent | 4ddbcfec59974641265b707ba6f1cb48193178c6 (diff) | |
| download | pkgsrc-cd7a2cab89aaeb9c468889b17290fd885bfa9cdc.tar.gz | |
Provide a new variable NO_EXPORT_CPP to further restrict CPP from getting into
MAKE_ENV. There is no effective way to unset CPP otherwise and there are
some packages (the cross compilers using gcc) where having CPP set will
break things.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d0d91c6152d..4b2ffafe6a0 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1229 2003/08/02 13:17:05 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1230 2003/08/04 21:06:47 jmc Exp $ # # This file is in the public domain. # @@ -340,7 +340,7 @@ MAKE_ENV+= CC="${CC}" .if defined(CXX) MAKE_ENV+= CXX="${CXX}" .endif -.if defined(CPP) +.if defined(CPP) && !defined(NO_EXPORT_CPP) MAKE_ENV+= CPP="${CPP}" .endif @@ -549,7 +549,7 @@ PLIST_SUBST+= PERL5_ARCHLIB=${PERL5_ARCHLIB:S/^${LOCALBASE}\///} .endif # base vs. GNU tools -.include "../../mk/tools.mk" +. include "../../mk/tools.mk" .if defined(USE_NEW_TEXINFO) INFO_FILES?= |