diff options
| author | nelson%bolyard.com <devnull@localhost> | 2009-03-30 20:31:03 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2009-03-30 20:31:03 +0000 |
| commit | fb32c84f3735e5626b62b59c9ec6ca9a5adc1e99 (patch) | |
| tree | 00a4e6dc5c002526aa1b7859546fde6a1dc8b6ee | |
| parent | 48f054bd276c0d8ceaf64b777be14d759d2ce2f7 (diff) | |
| download | nss-hg-fb32c84f3735e5626b62b59c9ec6ca9a5adc1e99.tar.gz | |
Bug 478563: Add _MSC_VER (the cl version) to coreconf.
Use -PDB:NONE only on versions of cl that support it.
Patch is a collaborative effort by Wan-Teh Chang, Kaspar Brand, and me.
SR=Wan-Teh Chang
| -rw-r--r-- | security/coreconf/WIN32.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/security/coreconf/WIN32.mk b/security/coreconf/WIN32.mk index ee7d89735..7b2deeed8 100644 --- a/security/coreconf/WIN32.mk +++ b/security/coreconf/WIN32.mk @@ -62,6 +62,10 @@ else BSDECHO = echo RC = rc.exe MT = mt.exe + # Determine compiler version + _MSC_VER_6 = 1200 # MSVC 6 + _MSC_VER := $(shell $(CC) 2>&1 | sed -ne \ + 's/.*[^0-9.]\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1\2/p' ) endif ifdef BUILD_TREE @@ -114,9 +118,11 @@ ifdef NS_USE_GCC else # !NS_USE_GCC OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS + ifeq ($(_MSC_VER),$(_MSC_VER_6)) ifndef MOZ_DEBUG_SYMBOLS OS_DLLFLAGS += -PDB:NONE endif + endif ifdef BUILD_OPT OS_CFLAGS += -MD ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE)) @@ -149,9 +155,11 @@ else # !NS_USE_GCC DEFINES += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME) DLLFLAGS += -DEBUG -OUT:"$@" LDFLAGS += -DEBUG +ifeq ($(_MSC_VER),$(_MSC_VER_6)) ifndef MOZ_DEBUG_SYMBOLS LDFLAGS += -PDB:NONE endif +endif # Purify requires /FIXED:NO when linking EXEs. LDFLAGS += /FIXED:NO endif |