diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2012-10-04 05:12:35 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2012-10-04 05:12:35 +0200 |
| commit | 02235d101f934178c1e63acd09e9e28f90961a0e (patch) | |
| tree | 157cdf2b3710a21693b44655cc16337227d3295d /solenv/gbuild/platform/macosx.mk | |
| parent | db1af9a43458bd7cc9995c3c4e901ddad4e79c8d (diff) | |
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
Diffstat (limited to 'solenv/gbuild/platform/macosx.mk')
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 1aad554722ba..2e2c20302132 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 \ |