diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-22 00:52:40 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-22 01:06:54 +0100 |
| commit | 0e72992d7492f36716e73068f9f93d9f25da9b02 (patch) | |
| tree | 22b7e573d898be937b862f4aa34ce5182b1712e0 /libxmlsec | |
| parent | cad65120c6da901bf9fe33ab16ad22217efed0c0 (diff) | |
libxslt, redland: properly quote rpath $ORIGIN
... so it can be passed from make to shell to configure to generated
Makefile to libtool to invoked gcc without loss of valuable dollars.
It is an open question to which extent this commit should be credited to
the designers of sh, autoconf, libtool, make, and/or Solaris ld.
Change-Id: I0709a49d7025dbfda4d9c0e7202ea932ec85e0cb
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/ExternalProject_xmlsec.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index f603954ad9ac..a0b182b6264c 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \ - LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl,-z,origin -Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib')",\ + LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl,-z,origin -Wl,-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib),\ $(if $(filter-out MACOSX,$(OS)),,LDFLAGS="-Wl,-dylib_file,@executable_path/libnssutil3.dylib:$(OUTDIR)/lib/libnssutil3.dylib")) \ && $(MAKE) \ && touch $@ |