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/libxslt/ExternalProject_xslt.mk | |
| parent | 37563db622eef1bf13fe78b21507fba033586560 (diff) | |
libxml2, libxslt: use libraries from WORKDIR
Change-Id: I3067e3c819a4918e1d3c91dc0e0cfa3e4fc92b3d
Diffstat (limited to 'external/libxslt/ExternalProject_xslt.mk')
| -rw-r--r-- | external/libxslt/ExternalProject_xslt.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk index fa1377093770..3243fee6b35e 100644 --- a/external/libxslt/ExternalProject_xslt.mk +++ b/external/libxslt/ExternalProject_xslt.mk @@ -32,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build): $(call gb_ExternalProject_run,build,\ cscript configure.js \ $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ + lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \ && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ ,win32) @@ -48,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build): $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \ $(if $(filter IOS,$(OS)),LIBS="-liconv") \ --disable-shared,--disable-static) \ - $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR)) \ + $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-src=$(call gb_UnpackedTarball_get_dir,xml2)) \ && chmod 777 xslt-config \ && $(MAKE) \ ) |