diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-12-07 15:38:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-12-07 16:31:01 +0100 |
| commit | d61e9c9c226cdebaf01f765f7cef657656640740 (patch) | |
| tree | 054a8047c3d856e35fad7a452133a6a785382180 /solenv/gbuild | |
| parent | 546cbc9182589e9fec1dc0a23f1af07ddfbc576c (diff) | |
Remove redundant gb_YACC indirection
(as discussed at 0a803c0a41f46be4019ddd2768b4be5669b7ab59 "Honor BISON passed
into configure")
Change-Id: I160a3c97414be47cd1efef0b7fac4af93a398ac6
Reviewed-on: https://gerrit.libreoffice.org/84684
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 1 |
5 files changed, 2 insertions, 7 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 0d9d2cb11bf6..0cfa5a25c145 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -403,9 +403,6 @@ $(call gb_YaccTarget_get_header_target,$(1)) : $(call gb_YaccTarget_get_target,$ endef -gb_YACC := $(BISON) - - # LexTarget class gb_LexTarget_get_source = $(1)/$(2).l diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 25142f70625c..bf15f5e472d0 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -149,7 +149,7 @@ define gb_YaccTarget__command $(call gb_Output_announce,$(2),$(true),YAC,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(3)) && \ - $(gb_YACC) $(T_YACCFLAGS) -v --defines=$(4) -o $(5) $(1) && touch $(3) ) + $(BISON) $(T_YACCFLAGS) -v --defines=$(4) -o $(5) $(1) && touch $(3) ) endef diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 1996135e2195..ebcd94553155 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -8,7 +8,6 @@ # gb_AWK := awk -gb_YACC := $(BISON) gb_CLASSPATHSEP := : gb_LICENSE := LICENSE diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index ec23efc08df7..2e45d9d7d212 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -28,7 +28,7 @@ define gb_YaccTarget__command $(call gb_Output_announce,$(2),$(true),YAC,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(3)) && \ - $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1) && touch $(3) ) + $(BISON) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1) && touch $(3) ) endef diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 2e4424e29cc8..11c1aa6d4b49 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -29,7 +29,6 @@ gb_LINK := link gb_AWK := awk gb_CLASSPATHSEP := ; gb_RC := rc -gb_YACC := $(BISON) # use CC/CXX if they are nondefaults ifneq ($(origin CC),default) |