solenv/gbuild/LinkTarget.mk | 18 +++++++++---------
solenv/gbuild/platform/com_GCC_class.mk | 10 ----------
solenv/gbuild/platform/com_MSC_class.mk | 9 ---------
3 files changed, 9 insertions(+), 28 deletions(-)
New commits:
commit 0841f2581c6e9b9301f7e8a4b75f38e19a5fc7f5
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Sat Apr 5 14:10:29 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Apr 15 13:56:15 2025 +0200
remove one level of indirection for bison and flex targets
Change-Id: I38c962f86285c04b52d0026274f9739cd144b111
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183745
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 5dbdadc23f87..37e37fc01807 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -34,7 +34,6 @@
# gb_LinkTarget_CXXFLAGS
# gb_LinkTarget_LDFLAGS
# gb_LinkTarget_INCLUDE
-# gb_YaccTarget__command(grammar-file, stem-for-message, source-target,
include-target)
# Same happens for the gb_LinkTarget_add_libs calls from
RepositoryExternal.mk. But we have no real
# way to separate for gbuild internal and external gb_LinkTarget_add_libs
calls.
@@ -467,7 +466,13 @@ $(call gb_YaccTarget_get_clean_target,%) :
rm -f $(call gb_YaccTarget_get_grammar_target,$*) $(call
gb_YaccTarget_get_header_target,$*) $(call gb_YaccTarget_get_target,$*))
$(call gb_YaccTarget_get_target,%) : $(call
gb_YaccTarget_get_source,$(SRCDIR),%)
- $(call gb_YaccTarget__command,$<,$*,$@,$(call
gb_YaccTarget_get_header_target,$*),$(call gb_YaccTarget_get_grammar_target,$*))
+ $(call gb_Output_announce,$*,$(true),YAC,3)
+ $(call gb_Trace_StartRange,$*,YAC)
+ mkdir -p $(@D) && \
+ $(call gb_Helper_wsl_path,$(WSL) $(BISON) -v $(T_YACCFLAGS) \
+ --defines=$(call gb_YaccTarget_get_header_target,$*) \
+ -o $(call gb_YaccTarget_get_grammar_target,$*) $<) && touch $@
+ $(call gb_Trace_EndRange,$*,YAC)
# call gb_YaccTarget_YaccTarget,yacctarget
define gb_YaccTarget_YaccTarget
@@ -491,7 +496,8 @@ $(call gb_LexTarget_get_clean_target,%) :
$(call gb_LexTarget_get_target,%) : $(call gb_LexTarget_get_source,$(SRCDIR),%)
$(call gb_Output_announce,$*,$(true),LEX,3)
$(call gb_Trace_StartRange,$*,LEX)
- $(call gb_LexTarget__command,$<,$*,$@,$(call
gb_LexTarget_get_scanner_target,$*))
+ mkdir -p $(@D) && \
+ $(call gb_Helper_wsl_path,$(FLEX) $(T_LEXFLAGS) -o$(call
gb_LexTarget_get_scanner_target,$*) $<) && touch $@
$(call gb_Trace_EndRange,$*,LEX)
# gb_LexTarget_LexTarget(scanner-file)
@@ -501,12 +507,6 @@ $(call gb_LexTarget_get_scanner_target,$(1)) : $(call
gb_LexTarget_get_target,$(
endef
-# gb_LexTarget__command(scanner-file, stem-for-message, done-pseudo-target,
source-target)
-define gb_LexTarget__command
- mkdir -p $(dir $(3)) && \
- $(call gb_Helper_wsl_path,$(FLEX) $(T_LEXFLAGS) -o$(4) $(1)) && touch
$(3)
-endef
-
# ObjCxxObject class
#
diff --git a/solenv/gbuild/platform/com_GCC_class.mk
b/solenv/gbuild/platform/com_GCC_class.mk
index cb6e37e39422..089399fa07be 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -188,16 +188,6 @@ endif
gb_PrecompiledHeader__create_reuse_files =
gb_PrecompiledHeader__copy_reuse_files =
-# YaccTarget class
-
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(3)) && \
- $(BISON) $(T_YACCFLAGS) -v --defines=$(4) -o $(5) $(1) && touch $(3) )
-
-endef
-
# CppunitTest class
ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index af458fed98f8..117e2485adb9 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -22,15 +22,6 @@ define gb_Helper_make_url
file:///$(strip $(1))
endef
-# YaccTarget class
-
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
- mkdir -p $(dir $(3)) && \
- $(call gb_Helper_wsl_path,$(WSL) $(BISON) $(T_YACCFLAGS) --defines=$(4)
-o $(5) $(1)) && touch $(3)
-
-endef
-
# CObject class
# $(call gb_CObject__compiler,flags,source,compiler)
