diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-26 08:46:36 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-26 09:40:04 +0100 |
| commit | d10fb7eb23174786e3704d288c1bb56e6e08cca1 (patch) | |
| tree | cb0b3fa74eeadfa3273df5a5dfcc4f8566bbfd71 /solenv/gbuild/platform | |
| parent | 8fc478308f680227d7253b4becfc698e289f2be1 (diff) | |
Use && rather than ; between commands, to not hide errors
Change-Id: I4f8dc3d338b64452dc92c850c7dc174bb59611bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162592
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'solenv/gbuild/platform')
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 29adbf9dc42f..58bca1f247cc 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -134,7 +134,7 @@ $(if $(call gb_LinkTarget__WantLock,$2), \ $(gb_LinkTarget__cmd_lockfile) -r -1 $(gb_LinkTarget__Lock) ; \ echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date -u),$(true),LNK,5)" ; \ ) - +$(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ;) \ + +$(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS &&) \ $(call gb_Helper_abbreviate_dirs,\ $(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX)) $(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ @@ -180,10 +180,10 @@ $(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\ $(WORKDIR)/LinkTarget/$(2).exports,$(1)))) $(if $(and $(filter CppunitTest Executable,$(TARGETTYPE)),$(filter EMSCRIPTEN,$(OS))), \ $(if $(filter TRUE,$(ENABLE_QT5)), \ - sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' $(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)); \ - cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js $(dir $(1)) ; \ + sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/' $(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)) && \ + cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js $(dir $(1)) && \ ) \ - cp $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir $(1))/soffice.data ; \ + cp $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir $(1))/soffice.data && \ cp $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata $(dir $(1))/soffice.data.js.metadata \ ) endef @@ -191,7 +191,7 @@ endef define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ rm -f $(1) && \ - $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS ; \ + $(if $(filter EMSCRIPTEN,$(OS)),unset PYTHONWARNINGS && \ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)), \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ |