summaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-11-01 14:46:34 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-11-01 15:07:42 +0200
commit57fb462cea757a2757aee8fba3144e68839fcaff (patch)
treed698091af012473ab7dd14837a84c7c3c9298efe /nss
parent33781373bd4da103492f7a6c1f5482e60d58f108 (diff)
Don't let NSS use the MSVC debugging runtime in an --enable-debug build
In an MSVC build, not exporting BUILD_OPT to the Mozilla build machinery causes the produced DLLs to use the debug CRT. The exact mechanism is a bit of a mystery, and I didn't feel like spending too much time trying to understand it. Using the debug CRT is confusing and wrong. Nothing in LO otherwise uses it. It also makes testing a build much harder for me at least, as I do that in a fairly pristine virtual machine with no MSVC debugging runtime available. (The normal CRT is bundled in the LO installer.) Change-Id: I27f774d92a3986d40162c870202bcdddd94aa7c6
Diffstat (limited to 'nss')
-rw-r--r--nss/makefile.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk
index db9767ad9718..ec0dacda6319 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -62,7 +62,14 @@ PATCH_FILES=nss.patch nss.aix.patch nss-config.patch \
PATCH_FILES+=nss_macosx.patch
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(debug)" != ""
+# For a MSVC build, not exporting BUILD_OPT causes the produced DLLs
+# to use the debug CRT. (The exact mechanism that causes this to
+# happen is a bit of a mystery...) That is confusing and wrong, as
+# nothing in LO otherwise uses that. It also makes testing a build
+# much harder for me at least, as I do that in a fairly pristine
+# virtual machine with no MSVC debugging runtime available. (The
+# normal CRT is bundled in the LO installer.)
+.IF "$(debug)" != "" && "$(OS)$(COM)" != "WNTMSC"
.ELSE
BUILD_OPT=1
.EXPORT: BUILD_OPT