[Libreoffice-commits] core.git: solenv/gbuild

[Caolán McNamara (via logerrit)]

 solenv/gbuild/platform/unxgcc.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7a3eaef6dd707781c2f4e341aebb9d4c42df780f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 10 09:32:31 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 10 15:01:06 2021 +0200

    for DISABLE_DYNLOADING support linking to static .a system libs
    
    Change-Id: I0b7e07c93f7314506c5b99847b53c09f4fc6d31c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120261
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 4a96547b48b8..4f6315faec68 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -130,9 +130,11 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
 		$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
 		    -Wl$(COMMA)--start-group \
+		    -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) \
+		    -Wl$(COMMA)-Bdynamic \
 		    $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)),$(T_STDLIBS_CXX)) \
 		    -Wl$(COMMA)--end-group \
 		    , \