Bug 522157 Make -D__FUNCTION__=__func__ global for Sun Studio on Solaris r=benjamin
authorGinn Chen <ginn.chen@sun.com>
Mon, 26 Oct 2009 14:25:40 +0800
changeset 34179 c8d83f6fc94ed025b452ed5d84f2d6ff08099e63
parent 34178 bf5dcfce29d4f37601316c22688966283e7a5bad
child 34180 4bda2085ef8b581cb80a0f50ccb549799ef1673d
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbenjamin
bugs522157
milestone1.9.3a1pre
Bug 522157 Make -D__FUNCTION__=__func__ global for Sun Studio on Solaris r=benjamin
config/rules.mk
js/src/config/rules.mk
storage/test/Makefile.in
xpcom/tests/Makefile.in
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -355,16 +355,20 @@ ifeq (,$(filter-out 1200 1300 1310,$(_MS
 CXXFLAGS		+= -GX
 else
 CXXFLAGS		+= -EHsc
 endif # _MSC_VER
 endif # GNU_CC
 endif # ENABLE_CXX_EXCEPTIONS
 endif # WINNT
 
+ifeq ($(SOLARIS_SUNPRO_CXX),1)
+CXXFLAGS += -features=extensions -D__FUNCTION__=__func__
+endif # Solaris Sun Studio C++
+
 ifeq (,$(filter-out WINNT WINCE,$(HOST_OS_ARCH)))
 HOST_PDBFILE=$(basename $(@F)).pdb
 endif
 
 ifndef TARGETS
 TARGETS			= $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
 endif
 
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -355,16 +355,20 @@ ifeq (,$(filter-out 1200 1300 1310,$(_MS
 CXXFLAGS		+= -GX
 else
 CXXFLAGS		+= -EHsc
 endif # _MSC_VER
 endif # GNU_CC
 endif # ENABLE_CXX_EXCEPTIONS
 endif # WINNT
 
+ifeq ($(SOLARIS_SUNPRO_CXX),1)
+CXXFLAGS += -features=extensions -D__FUNCTION__=__func__
+endif # Solaris Sun Studio C++
+
 ifeq (,$(filter-out WINNT WINCE,$(HOST_OS_ARCH)))
 HOST_PDBFILE=$(basename $(@F)).pdb
 endif
 
 ifndef TARGETS
 TARGETS			= $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
 endif
 
--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@@ -72,12 +72,8 @@ LOCAL_INCLUDES = \
 LIBS = \
 	$(LIBS_DIR) \
 	$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(SQLITE_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
-
-ifdef SOLARIS_SUNPRO_CXX
-CXXFLAGS += -features=extensions -D__FUNCTION__=__func__
-endif
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -141,20 +141,16 @@ endif
 
 LIBS += $(XPCOM_LIBS)
 
 # Needed to resolve __yylex (?)
 ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
 LIBS		+= -lpcap
 endif
 
-ifdef SOLARIS_SUNPRO_CXX
-CXXFLAGS += -features=extensions -D__FUNCTION__=__func__
-endif
-
 ENABLE_CXX_EXCEPTIONS = 1
 
 XPCSHELL_TESTS = unit
 
 # Make sure we have symbols in case we need to debug these.
 MOZ_DEBUG_SYMBOLS = 1
 
 include $(topsrcdir)/config/rules.mk