summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2013-09-09 16:35:40 +0000
committerjoerg <joerg@pkgsrc.org>2013-09-09 16:35:40 +0000
commit2b02703708b2356e6090d982d07c51419153d7d6 (patch)
tree1c1982155dae8f013fc2546d8817b7be11f76a9d /mk
parent6d2ef5cbc80b07b6eda719e2684af07c30b1ccb8 (diff)
downloadpkgsrc-2b02703708b2356e6090d982d07c51419153d7d6.tar.gz
Only add HAVE_LLVM / HAVE_GCC if they are already set.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.use.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index 2a56a32651a..adebfc9b2d6 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.use.mk,v 1.55 2013/09/08 16:32:17 joerg Exp $
+# $NetBSD: bsd.pkg.use.mk,v 1.56 2013/09/09 16:35:40 joerg Exp $
#
# Turn USE_* macros into proper depedency logic. Included near the top of
# bsd.pkg.mk, after bsd.prefs.mk.
@@ -20,7 +20,13 @@
#
.if defined(USE_BSD_MAKEFILE)
-MAKE_ENV+= ${BSD_MAKE_ENV} INSTALL=${TOOLS_INSTALL:Q} HAVE_LLVM=${HAVE_LLVM:Q} HAVE_GCC=${HAVE_GCC:Q}
+MAKE_ENV+= ${BSD_MAKE_ENV} INSTALL=${TOOLS_INSTALL:Q}
+. if defined(HAVE_LLVM)
+MAKE_ENV+= HAVE_LLVM=${HAVE_LLVM:Q}
+. endif
+. if defined(HAVE_GCC)
+MAKE_ENV+= HAVE_GCC=${HAVE_GCC:Q}
+. endif
.endif
.if defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake)