diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 11:48:22 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 11:57:28 +0100 |
| commit | 45ca1bfc22f5d6857aeefc1e444f369cf6519805 (patch) | |
| tree | 47b0ca41002ac8adbb00f2a7d8bff916c0466c06 /external/liblangtag | |
| parent | Fold URE: Linux ure/bin/* -> program/ (diff) | |
| download | core-45ca1bfc22f5d6857aeefc1e444f369cf6519805.tar.gz core-45ca1bfc22f5d6857aeefc1e444f369cf6519805.zip | |
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/liblangtag')
| -rw-r--r-- | external/liblangtag/ExternalProject_langtag.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index 15c78a9bc8de..c6b195d3c0a6 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -28,8 +28,8 @@ $(call gb_ExternalProject_get_state_target,langtag,build): LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \ LIBXML2_LIBS="$(if $(filter WNTMSC,$(OS)$(COM)),-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ - $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ + $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN) \ + $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN) \ $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ && $(if $(filter WNTMSC,$(OS)$(COM)),\ REAL_CC="$(shell cygpath -w $(lastword $(filter-out -%,$(CC))))" \ |