diff options
author | grant <grant@pkgsrc.org> | 2004-10-14 09:51:43 +0000 |
---|---|---|
committer | grant <grant@pkgsrc.org> | 2004-10-14 09:51:43 +0000 |
commit | f8258b249ddf0b81ad6f32df64ab0d4b7953ba16 (patch) | |
tree | 4c2a0a70012ffef152fc8c106d41c3afff9da4f6 | |
parent | 37e207c4438838534c5085902bb6be2b324e7dec (diff) | |
download | pkgsrc-f8258b249ddf0b81ad6f32df64ab0d4b7953ba16.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.
-rw-r--r-- | mk/tools.mk | 6 |
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} |