summaryrefslogtreecommitdiff
path: root/mk/tools.mk
diff options
context:
space:
mode:
authorgrant <grant>2004-10-14 09:51:43 +0000
committergrant <grant>2004-10-14 09:51:43 +0000
commit45ce0e7fea204fb88bf18fad2ba6f8befb5f74ea (patch)
tree4c2a0a70012ffef152fc8c106d41c3afff9da4f6 /mk/tools.mk
parent83e6a592adaf06b82876a71fc0b7318561c61e90 (diff)
downloadpkgsrc-45ce0e7fea204fb88bf18fad2ba6f8befb5f74ea.tar.gz
handle the operating system having GNU yacc (actually bison) and
explicitly undef YACC. YACC?=yacc is set in sys.mk, but this interferes with building some packages that require bison because they try ${YACC} and fail.
Diffstat (limited to 'mk/tools.mk')
-rw-r--r--mk/tools.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/tools.mk b/mk/tools.mk
index c2576f2a9e4..b76bce5cd7c 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.41 2004/10/12 01:17:36 tv Exp $
+# $NetBSD: tools.mk,v 1.42 2004/10/14 09:51:43 grant Exp $
#
# This Makefile creates a ${TOOLS_DIR} directory and populates the bin
# subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -186,6 +186,7 @@ _TOOLS_OVERRIDE.${_tool_}?= NO
#
_TOOLS_NEED_GNU.${_tool_}= YES
. for _pattern_ in ${_TOOLS_OPSYS_HAS_GNU.${_tool_}}
+_TOOLS_HAS_GNU.${_tool_}= YES
. if !empty(MACHINE_PLATFORM:M${_pattern_})
_TOOLS_NEED_GNU.${_tool_}= NO
. endif
@@ -333,6 +334,9 @@ _TOOLS_OVERRIDE.sed= NO
MAKEFLAGS+= _IGNORE_USE_GNU_TOOLS=
.endif
+.if ${_TOOLS_HAS_GNU.yacc} == "YES"
+. undef YACC
+.endif
.if ${_TOOLS_REPLACE.yacc} == "YES"
_TOOLS_OVERRIDE.yacc= YES
_TOOLS_PROGNAME.yacc= ${YACC}