Bug 557000 - Don't use GCC_VERSION to detect GCC in makefiles. r=ted
authorJacek Caban <jacek@codeweavers.com>
Sat, 01 May 2010 11:46:25 +0200
changeset 42198 ca141b029e795c01f97db651bedc36583fc76891
parent 42197 3145d617ccf24f419dac92e5d9f59225293e4019
child 42199 23f53ef7a5b412392c0cefd282848e9926f4532e
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)
reviewersted
bugs557000
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 557000 - Don't use GCC_VERSION to detect GCC in makefiles. r=ted
config/Makefile.in
memory/mozalloc/Makefile.in
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -134,22 +134,24 @@ export::
 		-DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
 		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
 	$(INSTALL) system_wrappers $(DIST)
 
 GARBAGE_DIRS += system_wrappers
 endif
 
 ifdef WRAP_STL_INCLUDES
-ifdef GCC_VERSION
+ifdef GNU_CXX
 stl_compiler = gcc
 else
+ifdef _MSC_VER
 stl_compiler = msvc
 endif
 endif
+endif
 
 ifdef stl_compiler
 stl-wrappers-sentinel: $(srcdir)/make-stl-wrappers.py $(srcdir)/$(stl_compiler)-stl-wrapper.template.h $(srcdir)/stl-headers $(GLOBAL_DEPS)
 	$(PYTHON) $(srcdir)/make-stl-wrappers.py stl_wrappers $(stl_compiler) $(srcdir)/$(stl_compiler)-stl-wrapper.template.h $(srcdir)/stl-headers
 	$(PYTHON) $(srcdir)/nsinstall.py stl_wrappers $(DIST)
 	touch stl-wrappers-sentinel
 
 export:: stl-wrappers-sentinel
--- a/memory/mozalloc/Makefile.in
+++ b/memory/mozalloc/Makefile.in
@@ -75,17 +75,17 @@ EXPORTS_mozilla 	=			\
 
 CPPSRCS 		=			\
 	mozalloc.cpp				\
 	mozalloc_abort.cpp			\
 	mozalloc_oom.cpp			\
 	$(NULL)
 
 ifdef WRAP_STL_INCLUDES #{
-ifdef GCC_VERSION #{
+ifdef GNU_CXX #{
 EXPORTS_mozilla	+= throw_gcc.h
 else
 ifdef _MSC_VER #{
 EXPORTS_mozilla	+= throw_msvc.h
 ifdef MOZ_MSVC_STL_WRAP__Throw #{
 EXPORTS_mozilla	+= msvc_throw_wrapper.h
 CPPSRCS		+= msvc_throw_wrapper.cpp
 else