diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2013-04-03 18:49:44 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-04 17:46:46 +0000 |
| commit | 368210926b67483a3926a0af1890127ca182e064 (patch) | |
| tree | e3c0ee0602b096d099d49af789da2b284cbf0685 /redland/ExternalProject_redland.mk | |
| parent | -I$(SRCDIR)/comphelper/inc before solver/*/inc (diff) | |
| download | core-368210926b67483a3926a0af1890127ca182e064.tar.gz core-368210926b67483a3926a0af1890127ca182e064.zip | |
remove -dylib_file mappings that are not needed anymore
XCode 2.5 (i.e. Mac OSX 10.4 & 10.5) couldn't find the libraries
without explicit mapping, but as baseline is now 10.6, this
wrapping is no longer necessary
Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8
Reviewed-on: https://gerrit.libreoffice.org/3192
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'redland/ExternalProject_redland.mk')
| -rw-r--r-- | redland/ExternalProject_redland.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index c35a5bfb1d82..bc47c3cd34e2 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -49,9 +49,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ LDFLAGS="-L$(OUTDIR)/lib \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \ - $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \ - $(if $(filter MACOSX,$(OS)), -Wl$(COMMA)-dylib_file$(COMMA)@loader_path/libraptor-lo.$(RAPTOR_MAJOR).dylib:$(OUTDIR)/lib/libraptor-lo.$(RAPTOR_MAJOR).dylib \ - $(if $(filter NO,$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib))" \ + $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ |