summaryrefslogtreecommitdiff
path: root/nss/ExternalProject_nss.mk
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 /nss/ExternalProject_nss.mk
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 'nss/ExternalProject_nss.mk')
-rw-r--r--nss/ExternalProject_nss.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk
index c853d89ddcf1..be1638544b9e 100644
--- a/nss/ExternalProject_nss.mk
+++ b/nss/ExternalProject_nss.mk
@@ -40,7 +40,7 @@ ifeq ($(OS),WNT)
ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
- $(if $(debug),,BUILD_OPT=1) \
+ $(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
$(if $(filter X,$(CPU)),USE_64=1) \
LIB="$(ILIB)" \