Part of bug 549129 - Restore -OPT:NOWIN98 on Mozilla 1.9.2 builds. r=Callek
authorSiddharth Agarwal <sid.bugzilla@gmail.com>
Thu, 15 Apr 2010 11:22:00 +0530
changeset 5444 5e43be84e43835ac9fe12cec557dbc2733730359
parent 5443 e42b6358c997fc5d6daca203f349ec13e761dff1
child 5445 4d451d2469282a68c8b1ddb69307182b2989528b
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs549129
Part of bug 549129 - Restore -OPT:NOWIN98 on Mozilla 1.9.2 builds. r=Callek
config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -266,17 +266,22 @@ endif
 
 # MOZ_DEBUG_SYMBOLS generates debug symbols in separate PDB files.
 # Used for generating an optimized build with debugging symbols.
 # Used in the Windows nightlies to generate symbols for crash reporting.
 ifdef MOZ_DEBUG_SYMBOLS
 OS_CXXFLAGS += -Zi -UDEBUG -DNDEBUG
 OS_CFLAGS += -Zi -UDEBUG -DNDEBUG
 OS_LDFLAGS += -DEBUG -OPT:REF
-endif
+ifdef MOZILLA_1_9_2_BRANCH
+# This breaks builds on VC10, but mozilla-1.9.2 doesn't build with VC10 anyway,
+# so this isn't a big loss.
+OS_LDFLAGS += -OPT:NOWIN98
+endif # MOZILLA_1_9_2_BRANCH
+endif # MOZ_DEBUG_SYMBOLS
 
 ifdef MOZ_QUANTIFY
 # -FIXED:NO is needed for Quantify to work, but it increases the size
 # of executables, so only use it if building for Quantify.
 WIN32_EXE_LDFLAGS += -FIXED:NO
 
 # We need -OPT:NOICF to prevent identical methods from being merged together.
 # Otherwise, Quantify doesn't know which method was actually called when it's