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

[Caolán McNamara]

 solenv/gbuild/platform/unxgcc.mk |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit f24f0ba63a57ab05a4aa3f57ef3d66d9371f1746
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 20 12:20:35 2016 +0000

    bodge linking for disable-dynamic-loading case
    
    Change-Id: I5c1c6cae8d2f179a68e0c6e11e89c7c947e4b479
    Reviewed-on: https://gerrit.libreoffice.org/32229
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index b1604c1..4a3a189 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -133,13 +133,20 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
-		-Wl$(COMMA)--start-group \
-		$(foreach lib,$(LINKED_STATIC_LIBS),\
-			$(call gb_StaticLibrary_get_target,$(lib))) \
-		$(T_LIBS) \
-		-Wl$(COMMA)--end-group \
-		-Wl$(COMMA)--no-as-needed \
-		$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \
+		$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
+		    -Wl$(COMMA)--start-group \
+		    $(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)--end-group \
+		    , \
+		    -Wl$(COMMA)--start-group \
+		    $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
+		    $(T_LIBS) \
+		    -Wl$(COMMA)--end-group \
+		    -Wl$(COMMA)--no-as-needed \
+		    $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \
+                ) \
 		-o $(1) \
 	$(if $(SOVERSIONSCRIPT),&& ln -sf ../../program/$(notdir $(1)) $(ILIBTARGET)))
 	$(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\