Bug 1031352 - move most of the _MSC_VER references in Makefile.in to …

…moz.build; r=glandium
dothq · Jun 27, 2014 · c599444 · c599444
1 parent 585e678
commit c599444
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 67 deletions.
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
@@ -55,10 +55,6 @@ ifdef NSS_DISABLE_DBM
 DEFINES += -DNSS_DISABLE_DBM=1
 endif
 
-ifdef _MSC_VER
-DEFINES += -D_MSC_VER=$(_MSC_VER)
-endif
-
 DEFINES += -DJAREXT=
 
 ifdef MOZ_ANGLE_RENDERER

diff --git a/intl/unicharutil/util/Makefile.in b/intl/unicharutil/util/Makefile.in
@@ -15,9 +15,3 @@ include $(topsrcdir)/config/rules.mk
 ifdef ENABLE_INTL_API
 LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
 endif
-
-ifdef _MSC_VER
-# Don't include directives about which CRT to use
-OS_COMPILE_CXXFLAGS += -Zl
-OS_COMPILE_CFLAGS += -Zl
-endif
diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build
@@ -33,3 +33,6 @@ USE_STATIC_LIBS = True
 
 if CONFIG['_MSC_VER']:
     DEFINES['_USE_ANSI_CPP'] = True
+    # Don't include directives about which CRT to use
+    CFLAGS += ['-Zl']
+    CXXFLAGS += ['-Zl']
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
@@ -232,12 +232,6 @@ else
 SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS)
 endif
 
-# Prevent floating point errors caused by VC++ optimizations
-ifdef _MSC_VER
-# XXX We should add this to CXXFLAGS, too?
-CFLAGS += -fp:precise
-endif # _MSC_VER
-
 ifeq ($(OS_ARCH),FreeBSD)
 EXTRA_LIBS	+= -pthread
 endif

diff --git a/js/src/moz.build b/js/src/moz.build
@@ -458,6 +458,9 @@ if CONFIG['_MSC_VER']:
         SOURCES['builtin/RegExp.cpp'].no_pgo = True # Bug 772303
     elif CONFIG['CPU_ARCH'] == 'x86_64' and CONFIG['JS_HAS_CTYPES']:
         SOURCES['ctypes/CTypes.cpp'].no_pgo = True # Bug 810661
+    # Prevent floating point errors caused by VC++ optimizations
+    # XXX We should add this to CXXFLAGS, too?
+    CFLAGS += ['-fp:precise']
 
 # Needed to "configure" it correctly.  Unfortunately these
 # flags wind up being applied to all code in js/src, not just

diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
@@ -3,13 +3,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 DIST_INSTALL	= 1
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef _MSC_VER
-# Don't include directives about which CRT to use
-OS_COMPILE_CXXFLAGS += -Zl
-OS_COMPILE_CFLAGS += -Zl
-endif
diff --git a/xpcom/glue/moz.build b/xpcom/glue/moz.build
@@ -105,6 +105,9 @@ FORCE_STATIC_LIB = True
 
 if CONFIG['_MSC_VER']:
     DEFINES['_USE_ANSI_CPP'] = True
+    # Don't include directives about which CRT to use
+    CFLAGS += ['-Zl']
+    CXXFLAGS += ['-Zl']
 
 LOCAL_INCLUDES += [
     '../build',

diff --git a/xpcom/glue/nomozalloc/Makefile.in b/xpcom/glue/nomozalloc/Makefile.in
@@ -3,13 +3,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 DIST_INSTALL	= 1
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef _MSC_VER
-# Don't include directives about which CRT to use
-OS_COMPILE_CXXFLAGS += -Zl
-OS_COMPILE_CFLAGS += -Zl
-endif
diff --git a/xpcom/glue/nomozalloc/moz.build b/xpcom/glue/nomozalloc/moz.build
@@ -25,6 +25,9 @@ FORCE_STATIC_LIB = True
 
 if CONFIG['_MSC_VER']:
     DEFINES['_USE_ANSI_CPP'] = True
+    # Don't include directives about which CRT to use
+    CFLAGS += ['-Zl']
+    CXXFLAGS += ['-Zl']
 
 DEFINES['MOZ_NO_MOZALLOC'] = True
 

diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in
@@ -3,13 +3,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 DIST_INSTALL	= 1
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef _MSC_VER
-# Don't include directives in obj files about which CRT to use
-OS_COMPILE_CXXFLAGS += -Zl
-OS_COMPILE_CFLAGS += -Zl
-endif
diff --git a/xpcom/glue/standalone/moz.build b/xpcom/glue/standalone/moz.build
@@ -32,6 +32,9 @@ FORCE_STATIC_LIB = True
 
 if CONFIG['_MSC_VER']:
     DEFINES['_USE_ANSI_CPP'] = True
+    # Don't include directives about which CRT to use
+    CFLAGS += ['-Zl']
+    CXXFLAGS += ['-Zl']
 
 DEFINES['XPCOM_GLUE'] = True
 

diff --git a/xpcom/glue/standalone/staticruntime/Makefile.in b/xpcom/glue/standalone/staticruntime/Makefile.in
@@ -2,13 +2,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 DIST_INSTALL	= 1
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef _MSC_VER
-# Don't include directives in obj files about which CRT to use
-OS_COMPILE_CXXFLAGS += -Zl
-OS_COMPILE_CFLAGS += -Zl
-endif
diff --git a/xpcom/glue/standalone/staticruntime/moz.build b/xpcom/glue/standalone/staticruntime/moz.build
@@ -24,6 +24,9 @@ FORCE_STATIC_LIB = True
 
 if CONFIG['_MSC_VER']:
     DEFINES['_USE_ANSI_CPP'] = True
+    # Don't include directives about which CRT to use
+    CFLAGS += ['-Zl']
+    CXXFLAGS += ['-Zl']
 
 DEFINES['XPCOM_GLUE'] = True
 

diff --git a/xpcom/glue/staticruntime/Makefile.in b/xpcom/glue/staticruntime/Makefile.in
@@ -3,13 +3,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 DIST_INSTALL	= 1
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef _MSC_VER
-# Don't include directives about which CRT to use
-OS_COMPILE_CXXFLAGS += -Zl
-OS_COMPILE_CFLAGS += -Zl
-endif
diff --git a/xpcom/glue/staticruntime/moz.build b/xpcom/glue/staticruntime/moz.build
@@ -24,6 +24,9 @@ FORCE_STATIC_LIB = True
 
 if CONFIG['_MSC_VER']:
     DEFINES['_USE_ANSI_CPP'] = True
+    # Don't include directives about which CRT to use
+    CFLAGS += ['-Zl']
+    CXXFLAGS += ['-Zl']
 
 LOCAL_INCLUDES += [
     '../../build',

diff --git a/xpcom/typelib/xpt/Makefile.in b/xpcom/typelib/xpt/Makefile.in
@@ -4,9 +4,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIST_INSTALL	= 1
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef _MSC_VER
-OS_COMPILE_CFLAGS += -Zl
-endif
diff --git a/xpcom/typelib/xpt/moz.build b/xpcom/typelib/xpt/moz.build
@@ -26,3 +26,6 @@ GENERATED_INCLUDES += ['/xpcom/base']
 LOCAL_INCLUDES += ['/xpcom/base']
 
 FAIL_ON_WARNINGS = True
+
+if CONFIG['_MSC_VER']:
+    CFLAGS += ['-Zl']