diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-22 18:02:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-22 22:30:20 +0200 |
| commit | c03ff5ebc0f008825e45285f7c4021329bd60c05 (patch) | |
| tree | f47d34d1d7f5f351a273d70b68ce8923aa0eedb1 /external/liblangtag | |
| parent | 37563db622eef1bf13fe78b21507fba033586560 (diff) | |
libxml2, libxslt: use libraries from WORKDIR
Change-Id: I3067e3c819a4918e1d3c91dc0e0cfa3e4fc92b3d
Diffstat (limited to 'external/liblangtag')
| -rw-r--r-- | external/liblangtag/ExternalProject_langtag.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index 23619ed3b2de..b4f17ced3e13 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -26,9 +26,10 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \ $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \ - $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \ - LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(OUTDIR)/lib -llibxml2","-L$(gb_Helper_OUTDIRLIBDIR) -lxml2"),\ - $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),\ + LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \ + LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2","-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2"),\ + $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(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) \ |