Bug 506493 - Resync' configure.in between c-c and m-c; (Kv1a) Copy bug 522157, Port bug 522440.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sun, 28 Mar 2010 17:36:42 +0200
changeset 5303 17581dee5a6873c85ce1cc5985061a4eac77e5ef
parent 5302 871b3d26feec89eba40cebb75eb5dd3dcc4ff91d
child 5304 ec978d35f3c753d5347696599bd4c671e3044717
push id4090
push usersgautherie.bz@free.fr
push dateSun, 28 Mar 2010 15:45:27 +0000
treeherdercomm-central@cbe96b862e08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs506493, 522157, 522440
Bug 506493 - Resync' configure.in between c-c and m-c; (Kv1a) Copy bug 522157, Port bug 522440. r=Callek. Bug 522157 - Make -D__FUNCTION__=__func__ global for Sun Studio on Solaris Bug 522440 - QCMS: Make sse/sse2 code built with Sun Studio 12 on Solaris
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -346,16 +346,25 @@ ifeq (,$(filter-out 1200 1300 1310,$(_MS
 CXXFLAGS		+= -GX
 else
 CXXFLAGS		+= -EHsc
 endif # _MSC_VER
 endif # GNU_CC
 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
+endif # x86
+endif # Solaris Sun Studio C++
+endif # ! MOZILLA_1_9_2_BRANCH
+
 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)
 endif