From d5897420b0df5222ef87dce60668df902a5e279a Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 2 Aug 2023 16:19:19 +0200 Subject: [PATCH] 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 --- solenv/gbuild/LinkTarget.mk | 7 +++---- solenv/gbuild/platform/com_MSC_class.mk | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index f4d15f411516..e054cffb4c85 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -499,9 +499,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 @@ -647,8 +646,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 7e6b5e8d3b57..5424da11d75c 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 -- 2.11.4.GIT