diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-12-06 17:22:36 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-12-06 20:32:31 +0100 |
| commit | d47628f287f4377394c4ff488c433bfe254b6abe (patch) | |
| tree | 2d2a962f7abcb457f89085b7e5cb5f0bd0be8a19 | |
| parent | 0559e7e183dcdcdb3e39870eb3354e51c876f2b7 (diff) | |
don't want to link to system static libs for DISABLE_DYNLOADING
since...
commit 4250958a492b300a52a83e68dd599f9c36c5086e
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Aug 20 14:31:36 2021 +0100
ofz: prep for allowing oss-fuzz msan
dependencies need to be built with the msan flags so undo the
--with-system .a usage now that trying to squeeze into the 12 hour build
window isn't critical because the afl 6-8 hour build+check is disabled
dropped the use case for that
Change-Id: Ic525c9e0a948195cc823d904ba5a0d80b3aff668
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126455
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index a7631f4446a3..c6b207983dc4 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -129,11 +129,9 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \ -Wl$(COMMA)--start-group \ - $(call gb_Helper_optional,FUZZERS,-Wl$(COMMA)-Bstatic) \ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ $(T_LIBS) \ - $(call gb_Helper_optional,FUZZERS,-Wl$(COMMA)-Bdynamic) \ $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)),$(T_STDLIBS_CXX)) \ -Wl$(COMMA)--end-group \ , \ |