Bug 552635 Port fix of Bug 550371 to comm-central
authorGinn Chen <ginn.chen@sun.com>
Sat, 10 Apr 2010 10:09:11 +0800
changeset 5425 b1b40a0933a64c1c2e6ea98d205c01b7f7a59d45
parent 5424 6327ffb044aa33d44dea95ab1c0a6bf4b9aa9f9f
child 5426 50629ea58c068f1eb3342cf14301e4027647ac79
push idunknown
push userunknown
push dateunknown
bugs552635, 550371
Bug 552635 Port fix of Bug 550371 to comm-central
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -345,25 +345,17 @@ endif
 
 ifdef MAPFILE
 OS_LDFLAGS += -MAP:$(MAPFILE)
 endif
 
 endif # !GNU_CC
 
 ifdef ENABLE_CXX_EXCEPTIONS
-ifdef GNU_CC
-CXXFLAGS		+= -fexceptions
-else
-ifeq (,$(filter-out 1200 1300 1310,$(_MSC_VER)))
-CXXFLAGS		+= -GX
-else
-CXXFLAGS		+= -EHsc
-endif # _MSC_VER
-endif # GNU_CC
+CXXFLAGS += $(MOZ_EXCEPTIONS_FLAGS_ON) -DMOZ_CPP_EXCEPTIONS=1
 endif # ENABLE_CXX_EXCEPTIONS
 endif # WINNT
 
 ifndef MOZILLA_1_9_2_BRANCH
 ifeq ($(SOLARIS_SUNPRO_CXX),1)
 CXXFLAGS += -features=extensions -D__FUNCTION__=__func__
 ifeq (86,$(findstring 86,$(OS_TEST)))
 OS_LDFLAGS += -M $(MOZILLA_DIR)/config/solaris_ia32.map