[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/platform/macosx.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 02235d101f934178c1e63acd09e9e28f90961a0e
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Oct 4 05:12:35 2012 +0200

    old Mac linker is picky about argument order - static libs last
    
    and also after stuff that references external symbols, as it only looks
    for symbols it has encountered so far in the object files. Stuff that
    comes after the specified library then results in symbols not found
    despite the lib being on the commandline earlier.
    
    (another solution than reordering the arguments would be to use
    -Wl,-all_load)
    
    Change-Id: If4add0d3f81b13874c1620406fa40fcbd25b7cf0

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 1aad554..2e2c203 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -212,10 +212,10 @@ $(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)`) \
-		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
+		`cat $${DYLIB_FILE}` \
 		$(LIBS) \
-		-o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) \
-		`cat $${DYLIB_FILE}` && \
+		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
+		-o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \
 	$(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1),:) && \
     $(if $(filter Executable,$(TARGETTYPE)), \
         $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \