diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-31 09:11:10 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-01 11:47:55 +0100 |
| commit | 42834bec6ba590f060e74c23324d362bf8d4fd1a (patch) | |
| tree | 860821c714bd6ce3c17cb109450697b53b509d1d /solenv | |
| parent | c5af1c2615ded871946a1ac60e67497fc8753495 (diff) | |
oss-fuzz: depend on linktarget, not the binary
Not really an oss-fuzz-only problem, but general linking of static
binaries.
Broken in commit ecc50f56b3282ec3b0364101d860f22fe8da9042
("gbuild: set library dependency for static builds").
Change-Id: Iba9c9405cf4adb78c1ec9b64dfa02c3a82d2cf55
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127800
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
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 7741da69c2b3..7f72ab131ac8 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1234,7 +1234,7 @@ else # DISABLE_DYNLOADING # depend on the now-static libraries themself, but only if the target actually links to it ifneq (,$(call gb_LinkTarget_does_real_link,$(1))) $(foreach lib,$(3),$(if $(filter $(lib),$(gb_Library_KNOWNLIBS)), \ - $(eval $(call gb_LinkTarget_get_target,$(1)) : $(call gb_Library_get_target,$(lib))) \ + $(eval $(call gb_LinkTarget_get_target,$(1)) : $(call gb_Library_get_linktarget_target,$(lib))) \ )) endif endif # DISABLE_DYNLOADING @@ -1330,7 +1330,7 @@ ifneq (,$(call gb_LinkTarget_does_real_link,$(1))) # make has a size limit for the prerequisites string, which will be exceeded for some larger static links, # like soffice.bin, but there seems to be no limit for makefile lines... $(foreach lib,$(2), \ - $$(eval $(call gb_LinkTarget_get_target,$(1)): $(call gb_StaticLibrary_get_target,$(lib)))) + $$(eval $(call gb_LinkTarget_get_target,$(1)): $(call gb_StaticLibrary_get_linktarget_target,$(lib)))) endif $(call gb_LinkTarget_get_headers_target,$(1)) : \ $(foreach lib,$(2),$(call gb_StaticLibrary_get_headers_target,$(lib))) |