summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authordanw <danw>2004-03-19 00:03:55 +0000
committerdanw <danw>2004-03-19 00:03:55 +0000
commitb38799da667fc59395a7b712948b7542470929c7 (patch)
tree99f08427df4368cd2734bf766e201379b15c609d /mk
parentbe5e3515b5cac61e4b6abd8bbc66f6a2856e482f (diff)
downloadpkgsrc-b38799da667fc59395a7b712948b7542470929c7.tar.gz
When using imake and buildlink together, assert our definitions of
CC and CXX on the make command line, in case imake's definitions use complete paths (which would get around the buildlink wrappers)
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index a6595cd250f..32d20f7f9ca 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1424 2004/03/17 16:36:28 danw Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1425 2004/03/19 00:03:55 danw Exp $
#
# This file is in the public domain.
#
@@ -168,6 +168,9 @@ PLIST_SUBST+= IMAKE_MAN_SOURCE_PATH=${IMAKE_MAN_SOURCE_PATH} \
IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX} \
IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX} \
IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX}
+. if empty(USE_BUILDLINK2:M[nN][oO]) || empty(USE_BUILDLINK3:M[nN][oO])
+MAKE_FLAGS+= CC="${CC}" CXX="${CXX}"
+. endif
.endif
.if defined(USE_X11BASE)
USE_X11?= implied