summaryrefslogtreecommitdiff
path: root/libxml2
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-14 13:52:56 +0200
committerMichael Stahl <mstahl@redhat.com>2013-04-15 15:26:32 +0200
commit4811c2dc9f94929b60e7e2e0077871aad14fdc3a (patch)
tree8754348c8dbdf9c4fb91e0d70346f96ee7455999 /libxml2
parent3b65852f37f1c8daf8c5c0af1d810c68cc71d8e3 (diff)
adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules: curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec, lpsolve, nss, openssl, python3 lcms2 has an inconsistency where the .lib and the .dll don't agree on the .dll name. openssl gets a honorable mention because apparently it's undocumented custom build system can build with /MDd if one picks the right configuration but i couldn't figure out how to do that in an hour of trying, and just patched the release config instead. Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
Diffstat (limited to 'libxml2')
-rw-r--r--libxml2/ExternalProject_xml2.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/libxml2/ExternalProject_xml2.mk b/libxml2/ExternalProject_xml2.mk
index 8d7f00c334f0..5ea4682c1b5a 100644
--- a/libxml2/ExternalProject_xml2.mk
+++ b/libxml2/ExternalProject_xml2.mk
@@ -31,7 +31,8 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
else # COM=MSC
$(call gb_ExternalProject_get_state_target,xml2,build):
$(call gb_ExternalProject_run,build,\
- cscript configure.js iconv=no sax1=yes \
+ cscript configure.js \
+ iconv=no sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
&& unset MAKEFLAGS \
&& LIB="$(ILIB)" nmake \
,win32)