diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-01-25 15:22:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-01-26 08:07:46 +0100 |
| commit | 822b551f6ca92c9d4a8fb17dfc7ba28c272794cc (patch) | |
| tree | 1b59ad8a9760b296e88cd999176cabad8d6dfc9a /solenv | |
| parent | bc1b2b03718b596506db2acedd6dad10f489d9fe (diff) | |
gbuild: fix spurious rebuilds from gb_LinkTarget__use_libraries
Apparently the eval inside of "ifeq" needs to be escaped, currently both
branches of the "ifeq" are evaluated and generate makefile dependencies,
which causes spurious rebuild of Library_salhelper with
DISABLE_DYNLOADING unset from:
make Library_salhelper && touch -c ../master/sal/osl/all/compat.cxx && make Library_salhelper
(regression from ecc50f56b3282ec3b0364101d860f22fe8da9042)
Change-Id: I8b5607b7a172c8b4b05abeaf4d5ff3a68d53cb14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128930
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index bb6b4b1fedbc..86533ab3f60f 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1326,7 +1326,7 @@ ifeq (,$(DISABLE_DYNLOADING)) # for faster incremental builds when the ABI is unchanged. # export files are created from the library, so this also ensures the library exists. $(foreach lib,$(call gb_LinkTarget__filter_lo_libraries,$(3)),$(if $(filter $(lib),$(gb_Library_KNOWNLIBS)), \ - $(eval $(call gb_LinkTarget_get_target,$(1)) : $(call gb_Library_get_exports_target,$(lib))) \ + $$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call gb_Library_get_exports_target,$(lib))) \ )) else # DISABLE_DYNLOADING @@ -1335,7 +1335,7 @@ ifneq (,$(call gb_LinkTarget_does_real_link,$(1))) $(call gb_LinkTarget_get_target,$(1)) : T_LIBS += $(call gb_LinkTarget__filter_sys_libraries,$(3)) $(if $(filter-out Library,gb_LinkTarget__get_workdir_linktargetclass,$(1)), \ $(foreach lib,$(call gb_LinkTarget__filter_lo_libraries,$(3)),$(if $(filter $(lib),$(gb_Library_KNOWNLIBS)), \ - $(eval $(call gb_LinkTarget_get_target,$(1)) : $(call gb_Library_get_linktarget_target,$(lib))) \ + $$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call gb_Library_get_linktarget_target,$(lib))) \ ))) endif endif # DISABLE_DYNLOADING |