diff options
author | recht <recht@pkgsrc.org> | 2004-10-27 21:45:53 +0000 |
---|---|---|
committer | recht <recht@pkgsrc.org> | 2004-10-27 21:45:53 +0000 |
commit | b83ac5ddfa70067e00ca79047715f5f284eb8f13 (patch) | |
tree | 1ae9aa46878fdf4a716100fa7417ff9b2dc385f7 /mk | |
parent | 4c8677a37b74d7f4401c7991bd3fe659ec8d0daf (diff) | |
download | pkgsrc-b83ac5ddfa70067e00ca79047715f5f284eb8f13.tar.gz |
- Allow CXXFLAGS to be set on a per-OS basis (read added to OPSYSVARS).
- Set CXXFLAGS in the MAKE_ENV (if defined).
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index dd2b9a1c392..d4cbe798056 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1527 2004/10/27 13:47:41 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1528 2004/10/27 21:45:53 recht Exp $ # # This file is in the public domain. # @@ -80,7 +80,7 @@ MAKE_ENV+= OBJECT_FMT="${OBJECT_FMT}" .endif # Allow variables to be set on a per-OS basis -OPSYSVARS+= CFLAGS CPPFLAGS LDFLAGS LIBS +OPSYSVARS+= CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS .for _var_ in ${OPSYSVARS:O} . if defined(${_var_}.${OPSYS}) ${_var_}+= ${${_var_}.${OPSYS}} @@ -475,6 +475,9 @@ MAKE_ENV+= CXX="${CXX}" .if defined(CPP) && !defined(NO_EXPORT_CPP) MAKE_ENV+= CPP="${CPP}" .endif +.if defined(CXXFLAGS) +MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" +.endif # export the flags needed to compile and link pthreaded code MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" |