solenv/gbuild/ExternalProject.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 0e3092fd6c8dc8908bd7820a4eb858771ca7eb00 Author: Luboš Luňák <[email protected]> AuthorDate: Sun Feb 13 01:18:10 2022 +0100 Commit: Luboš Luňák <[email protected]> CommitDate: Sun Feb 13 13:17:51 2022 +0100 set up gb_COMPILER_SETUP properly for gb_ExternalProject_run If the command to run would be "cmd1 && cmd2", the old way would set up the variables only for the first command. Change-Id: I190bbf535eab4fb0191a87add2ec19e9a2f11e0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129878 Tested-by: Jenkins Reviewed-by: Luboš Luňák <[email protected]> diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 94f8daee37fc..ef10c1d2884f 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -222,7 +222,8 @@ $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) && \ unset Platform && \ $(if $(WRAPPERS),export $(WRAPPERS) &&) \ $(if $(NMAKE),export $(NMAKE) &&) \ - $(gb_COMPILER_SETUP) $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if $(4),$(4),$(1).log)) + $(if $(gb_COMPILER_SETUP),export $(gb_COMPILER_SETUP) &&) \ + $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if $(4),$(4),$(1).log)) ) endef
