core.git: Branch 'distro/allotropia/zeta-24-2' - solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/LinkTarget.mk             |    7 +++----
 solenv/gbuild/platform/com_MSC_class.mk |    3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 21995b0f8313ae75e7272805c29a4ea5702523e4
Author:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Aug 2 16:19:19 2023 +0200
Commit:     Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Wed Oct 2 19:41:19 2024 +0200

    run bison, flex and nasm via wsl in wsl-as-helper case
    
    Change-Id: Ic3e82b72605cd0b5458bd31ab5ff5285adb3db75
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166340
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174243
    Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
    Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f0aa8cc214c9..a4e44d52d6e9 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -502,9 +502,8 @@ endef
 
 #  gb_LexTarget__command(scanner-file, stem-for-message, done-pseudo-target, 
source-target)
 define gb_LexTarget__command
-$(call gb_Helper_abbreviate_dirs,\
        mkdir -p $(dir $(3)) && \
-       $(FLEX) $(T_LEXFLAGS) -o$(4) $(1) && touch $(3) )
+       $(call gb_Helper_wsl_path,$(FLEX) $(T_LEXFLAGS) -o$(4) $(1)) && touch 
$(3)
 endef
 
 
@@ -669,8 +668,8 @@ $(call gb_GenNasmObject_get_target,%) :
        $(call gb_Trace_StartRange,$*,ASM)
        test -f $(call gb_GenNasmObject_get_source,$*) || (echo "Missing 
generated source file $(call gb_GenNasmObject_get_source,$*)" && false)
        mkdir -p $(dir $@) $(dir $(call gb_GenNasmObject_get_dep_target,$*)) && 
cd $(SRCDIR) && \
-           $(NASM) $(T_NASMFLAGS) $(T_NASMFLAGS_APPEND) -I$(dir $(call 
gb_GenNasmObject_get_source,$*)) \
-           $(call gb_GenNasmObject_get_source,$*) -o $@ && \
+           $(call gb_Helper_wsl_path,$(NASM) $(T_NASMFLAGS) 
$(T_NASMFLAGS_APPEND) -I$(dir $(call gb_GenNasmObject_get_source,$*)) \
+           $(call gb_GenNasmObject_get_source,$*) -o $@) && \
            echo "$@ : $(call gb_GenNasmObject_get_source,$*)" > $(call 
gb_GenNasmObject_get_dep_target,$*)
        $(call gb_Trace_EndRange,$*,ASM)
 
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 911b0356e2fc..43b525c29cd0 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -26,9 +26,8 @@ endef
 
 define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
        mkdir -p $(dir $(3)) && \
-       $(BISON) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1) && touch $(3) )
+       $(call gb_Helper_wsl_path,$(WSL) $(BISON) $(T_YACCFLAGS) --defines=$(4) 
-o $(5) $(1)) && touch $(3)
 
 endef