[Libreoffice-commits] .: solenv/gbuild

Stephan Bergmann sbergmann at kemper.freedesktop.org
Thu May 3 01:37:48 PDT 2012


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

New commits:
commit 4d68b95cb9e2fcf761940de6f8662d21218452f2
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date:   Sat Apr 28 20:57:54 2012 +0200

    add --not-as-needed linker option on unxgcc platform
    
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>:  Ubuntu changed ld to
    assume --as-needed by default, but there are places in LO that implicitly depend
    on --no-as-needed, like test_smoketest lib that is an empty wrapper around
    smoketest lib, or UNO executables having to link against all URE published libs
    so that LO extensions are guaranteed to find the URE libs.
    
    Change-Id: I88fc79766ffb4a4ca8ead05bb9033c686120cf2c

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d288d63..89665d6 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -213,6 +213,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(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))) -Wl$(COMMA)--end-group \
+		-Wl$(COMMA)--no-as-needed \
 		$(LIBS) \
 		$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
 		-o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)))


More information about the Libreoffice-commits mailing list