diff options
Diffstat (limited to 'nss')
-rw-r--r-- | nss/ExternalProject_nss.mk | 2 | ||||
-rw-r--r-- | nss/nss.patch | 8 |
2 files changed, 7 insertions, 3 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)" \ diff --git a/nss/nss.patch b/nss/nss.patch index d0e33181ec99..ca8106141c36 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -120,7 +120,7 @@ ifndef BUILD_OPT --- misc/nss-3.13.5/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 +++ misc/build/nss-3.13.5/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 -@@ -324,7 +324,12 @@ +@@ -324,10 +324,15 @@ # IMPL_STRATEGY may be defined too. # @@ -133,7 +133,11 @@ +OBJDIR_NAME = out ifeq (,$(filter-out WIN%,$(OS_TARGET))) - ifndef BUILD_OPT +-ifndef BUILD_OPT ++ifdef THIS_HAS_BEEN_DISABLED_TO_GET_out + # + # Define USE_DEBUG_RTL if you want to use the debug runtime library + # (RTL) in the debug build --- misc/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 @@ -41,27 +41,32 @@ |