summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-12-06 16:26:27 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-12-06 19:20:48 +0100
commit0a803c0a41f46be4019ddd2768b4be5669b7ab59 (patch)
tree34f7ce80c998e8876de81bde1aa0b10521dd343b /solenv/gbuild
parenta596dd99de287c696c70f0c789a774399381f36f (diff)
Honor BISON passed into configure
...and require new-enough Bison for --enable-compiler-plugins to not generate bogus loplugin:external warnings in Bison boilerplate code. (As happend for me on macOS where /usr/bin/bison is version 2.3. Not sure which versions exactly are too old, but at least 3.4.1 is known good. If other versions newer than 2.3 turn out to be problematic too, the configure.ac check will need to be adapted.) No idea why there need to be three places across solenv/gbuild/ that set gb_YACC (to the same bison in each case), but leave that to be cleaned up later. Change-Id: I01d8219726f8df7895631b817866207327367759 Reviewed-on: https://gerrit.libreoffice.org/84650 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv/gbuild')
-rw-r--r--solenv/gbuild/LinkTarget.mk2
-rw-r--r--solenv/gbuild/platform/com_GCC_defs.mk2
-rw-r--r--solenv/gbuild/platform/com_MSC_defs.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 695becffd076..0d9d2cb11bf6 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -403,7 +403,7 @@ $(call gb_YaccTarget_get_header_target,$(1)) : $(call gb_YaccTarget_get_target,$
endef
-gb_YACC := bison
+gb_YACC := $(BISON)
# LexTarget class
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 712a61df544f..1996135e2195 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -8,7 +8,7 @@
#
gb_AWK := awk
-gb_YACC := bison
+gb_YACC := $(BISON)
gb_CLASSPATHSEP := :
gb_LICENSE := LICENSE
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 8ba47447df32..2e4424e29cc8 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -29,7 +29,7 @@ gb_LINK := link
gb_AWK := awk
gb_CLASSPATHSEP := ;
gb_RC := rc
-gb_YACC := bison
+gb_YACC := $(BISON)
# use CC/CXX if they are nondefaults
ifneq ($(origin CC),default)