[Libreoffice-commits] .: Branch 'integration/dev300_m101' - solenv/gbuild

[Jan Holesovsky]

 solenv/gbuild/platform/linux.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 233af7940f364252672c14f89b63e8ca01057756
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Mar 15 19:21:30 2011 +0100

    When linking, first specify -o's, then -l's.
    
    Some linkers do not find some symbols otherwise.

diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index c9988df..1721f7d 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -227,11 +227,11 @@ $(call gb_Helper_abbreviate_dirs,\
 	$(gb_CXX) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
-		$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
+		$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
 		-o $(1))
 endef