summaryrefslogtreecommitdiff
path: root/external/libxslt
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-28 11:48:22 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-28 11:57:28 +0100
commit45ca1bfc22f5d6857aeefc1e444f369cf6519805 (patch)
tree47b0ca41002ac8adbb00f2a7d8bff916c0466c06 /external/libxslt
parenteef94c1655605ce890f182e31f3cc64ee3748625 (diff)
Fold URE: Linux ure/lib/* -> program/
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge (and juh.jar had lacked adaption for Mac OS X). Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
Diffstat (limited to 'external/libxslt')
-rw-r--r--external/libxslt/ExternalProject_xslt.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk
index 4c4967e3f834..9b4632e5772e 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/external/libxslt/ExternalProject_xslt.mk
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
./configure --without-crypto --without-python \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
- LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
+ LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN" -Wl$(COMMA)-noinhibit-exec) \
$(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \