Bug 976896 - Port STL_FLAGS to moz.build; r=mshal

iaxat · Mar 5, 2014 · 243d01c · 243d01c
1 parent f886d07
commit 243d01c
Show file tree

Hide file tree

Showing 124 changed files with 144 additions and 192 deletions.
diff --git a/b2g/app/Makefile.in b/b2g/app/Makefile.in
@@ -28,8 +28,6 @@ LIBS += \
 endif
 endif
 
-STL_FLAGS=
-
 LIBS += $(JEMALLOC_LIBS)
 
 LIBS += \

diff --git a/b2g/app/moz.build b/b2g/app/moz.build
@@ -41,3 +41,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     ]
 
     LDFLAGS += ['-Wl,--export-dynamic']
+
+DISABLE_STL_WRAPPING = True
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
@@ -26,8 +26,6 @@ endif #} LIBXUL_SDK
 
 # Build a binary bootstrapping with XRE_main
 
-STL_FLAGS=
-
 LIBS += \
 	$(XPCOM_STANDALONE_GLUE_LDOPTS) \
 	$(NULL)

diff --git a/browser/app/moz.build b/browser/app/moz.build
@@ -52,3 +52,5 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 # Set it to 256k.  See bug 127069.
 if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
     LDFLAGS += ['/HEAP:0x40000']
+
+DISABLE_STL_WRAPPING = True
diff --git a/build/stlport/Makefile.in b/build/stlport/Makefile.in
@@ -3,7 +3,6 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULES = stlport
-STL_FLAGS =
 
 # Force to build a static library, instead of a fake library, without
 # installing it in dist/lib.

diff --git a/build/stlport/moz.build b/build/stlport/moz.build
@@ -52,3 +52,4 @@ LOCAL_INCLUDES += [
     'stlport',
 ]
 
+DISABLE_STL_WRAPPING = True
diff --git a/build/unix/stdc++compat/Makefile.in b/build/unix/stdc++compat/Makefile.in
@@ -2,7 +2,6 @@
 # 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/.
 
-STL_FLAGS =
 NO_EXPAND_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/build/unix/stdc++compat/moz.build b/build/unix/stdc++compat/moz.build
@@ -17,3 +17,5 @@ if CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']:
 FORCE_STATIC_LIB = True
 
 NO_PGO = True
+
+DISABLE_STL_WRAPPING = True
diff --git a/config/config.mk b/config/config.mk
@@ -590,7 +590,7 @@ endif
 endif
 
 COMPILE_CFLAGS	= $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_CPPFLAGS) $(OS_COMPILE_CFLAGS) $(CFLAGS) $(MOZBUILD_CFLAGS) $(EXTRA_COMPILE_FLAGS)
-COMPILE_CXXFLAGS = $(STL_FLAGS) $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_CPPFLAGS) $(OS_COMPILE_CXXFLAGS) $(CXXFLAGS) $(MOZBUILD_CXXFLAGS) $(EXTRA_COMPILE_FLAGS)
+COMPILE_CXXFLAGS = $(if $(DISABLE_STL_WRAPPING),,$(STL_FLAGS)) $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_CPPFLAGS) $(OS_COMPILE_CXXFLAGS) $(CXXFLAGS) $(MOZBUILD_CXXFLAGS) $(EXTRA_COMPILE_FLAGS)
 COMPILE_CMFLAGS = $(OS_COMPILE_CMFLAGS) $(MOZBUILD_CMFLAGS) $(EXTRA_COMPILE_FLAGS)
 COMPILE_CMMFLAGS = $(OS_COMPILE_CMMFLAGS) $(MOZBUILD_CMMFLAGS) $(EXTRA_COMPILE_FLAGS)
 ASFLAGS += $(EXTRA_ASSEMBLER_FLAGS)
@@ -900,7 +900,7 @@ DEFINES += -DUNICODE -D_UNICODE
 LOCAL_INCLUDES += -I'$(MOZ_DIRECTX_SDK_PATH)/include'
 endif
 
-STL_FLAGS=
+DISABLE_STL_WRAPPING := 1
 # Skip most Mozilla-specific include locations.
 INCLUDES = -I. $(LOCAL_INCLUDES) -I$(DEPTH)/dist/include
 endif
diff --git a/dom/plugins/ipc/hangui/Makefile.in b/dom/plugins/ipc/hangui/Makefile.in
@@ -4,10 +4,6 @@
 
 OS_LIBS = $(call EXPAND_LIBNAME,comctl32)
 
-STL_FLAGS = \
-  -D_HAS_EXCEPTIONS=0 \
-  $(NULL)
-
 MOZ_GLUE_LDFLAGS =
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/plugins/ipc/hangui/moz.build b/dom/plugins/ipc/hangui/moz.build
@@ -15,6 +15,9 @@ UNIFIED_SOURCES += [
 include('/ipc/chromium/chromium-config.mozbuild')
 
 DEFINES['NS_NO_XPCOM'] = True
+DEFINES['_HAS_EXCEPTIONS'] = 0
+
+DISABLE_STL_WRAPPING = True
 
 if CONFIG['GNU_CC']:
     WIN32_EXE_LDFLAGS += ['-municode']

diff --git a/dom/plugins/test/testplugin/testplugin.mk b/dom/plugins/test/testplugin/testplugin.mk
@@ -3,9 +3,6 @@
 # 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/.
 
-# Don't use STL wrappers; nptest isn't Gecko code
-STL_FLAGS =
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 include $(topsrcdir)/config/config.mk
 CXXFLAGS        += $(MOZ_QT_CFLAGS)

diff --git a/dom/plugins/test/testplugin/testplugin.mozbuild b/dom/plugins/test/testplugin/testplugin.mozbuild
@@ -42,6 +42,9 @@ FORCE_SHARED_LIB = True
 # must link statically with the CRT; nptest isn't Gecko code
 USE_STATIC_LIBS = True
 
+# Don't use STL wrappers; nptest isn't Gecko code
+DISABLE_STL_WRAPPING = True
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     RCFILE  = 'nptest.rc'
     RESFILE = 'nptest.res'

diff --git a/embedding/tests/winEmbed/Makefile.in b/embedding/tests/winEmbed/Makefile.in
@@ -32,8 +32,6 @@ LIBS = \
 	$(XPCOM_STANDALONE_GLUE_LDOPTS) \
 	$(NULL)
 
-STL_FLAGS=
-
 OS_LIBS		+= $(call EXPAND_LIBNAME,ole32 comdlg32 shell32 version)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/embedding/tests/winEmbed/moz.build b/embedding/tests/winEmbed/moz.build
@@ -31,3 +31,5 @@ else:
     #
     # Set it to 256k.  See bug 127069.
     LDFLAGS += ['/HEAP:0x40000']
+
+DISABLE_STL_WRAPPING = True
diff --git a/gfx/angle/src/libEGL/Makefile.in b/gfx/angle/src/libEGL/Makefile.in
@@ -2,9 +2,6 @@
 # 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/.
 
-# ANGLE uses the STL, so we can't use our derpy STL wrappers.
-STL_FLAGS =
-
 ifndef GNU_CC
 # Enable unwind semantics for exception handlers in response to warning C4530.
 OS_CPPFLAGS += -EHsc

diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build
@@ -45,3 +45,6 @@ DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
 
 RCFILE = SRCDIR + '/libEGL.rc'
 DEFFILE = SRCDIR + '/libEGL.def'
+
+# ANGLE uses the STL, so we can't use our derpy STL wrappers.
+DISABLE_STL_WRAPPING = True
diff --git a/gfx/angle/src/libGLESv2/Makefile.in b/gfx/angle/src/libGLESv2/Makefile.in
@@ -2,9 +2,6 @@
 # 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/.
 
-# ANGLE uses the STL, so we can't use our derpy STL wrappers.
-STL_FLAGS =
-
 ifndef GNU_CC
 # Enable unwind semantics for exception handlers in response to warning C4530.
 OS_CPPFLAGS += -EHsc

diff --git a/gfx/angle/src/libGLESv2/moz.build b/gfx/angle/src/libGLESv2/moz.build
@@ -199,3 +199,6 @@ DEFINES['ANGLE_COMPILE_OPTIMIZATION_LEVEL'] = 'D3DCOMPILE_OPTIMIZATION_LEVEL1'
 
 RCFILE = SRCDIR + '/libGLESv2.rc'
 DEFFILE = SRCDIR + '/libGLESv2.def'
+
+# ANGLE uses the STL, so we can't use our derpy STL wrappers.
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/Makefile.in b/media/omx-plugin/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)

diff --git a/media/omx-plugin/froyo/Makefile.in b/media/omx-plugin/froyo/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \

diff --git a/media/omx-plugin/froyo/moz.build b/media/omx-plugin/froyo/moz.build
@@ -18,3 +18,5 @@ LOCAL_INCLUDES += [
     '../include/froyo/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/gb/Makefile.in b/media/omx-plugin/gb/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \

diff --git a/media/omx-plugin/gb/moz.build b/media/omx-plugin/gb/moz.build
@@ -18,3 +18,5 @@ LOCAL_INCLUDES += [
     '../include/gb/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/gb235/Makefile.in b/media/omx-plugin/gb235/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \

diff --git a/media/omx-plugin/gb235/moz.build b/media/omx-plugin/gb235/moz.build
@@ -18,3 +18,5 @@ LOCAL_INCLUDES += [
     '../include/gb/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/hc/Makefile.in b/media/omx-plugin/hc/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \

diff --git a/media/omx-plugin/hc/moz.build b/media/omx-plugin/hc/moz.build
@@ -18,3 +18,5 @@ LOCAL_INCLUDES += [
     '../include/gb/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/kk/Makefile.in b/media/omx-plugin/kk/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \

diff --git a/media/omx-plugin/kk/moz.build b/media/omx-plugin/kk/moz.build
@@ -18,3 +18,5 @@ LOCAL_INCLUDES += [
     '../include/ics/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \

diff --git a/media/omx-plugin/lib/froyo/libstagefright/moz.build b/media/omx-plugin/lib/froyo/libstagefright/moz.build
@@ -19,3 +19,5 @@ LOCAL_INCLUDES += [
     '/media/omx-plugin/include/froyo/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/lib/gb/libstagefright/Makefile.in b/media/omx-plugin/lib/gb/libstagefright/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \

diff --git a/media/omx-plugin/lib/gb/libstagefright/moz.build b/media/omx-plugin/lib/gb/libstagefright/moz.build
@@ -19,3 +19,5 @@ LOCAL_INCLUDES += [
     '/media/omx-plugin/include/gb/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 # EXTRA_DSO_LDOPTS += \

diff --git a/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build b/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
@@ -19,3 +19,5 @@ LOCAL_INCLUDES += [
     '/media/omx-plugin/include/gb/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/lib/gb/libutils/Makefile.in b/media/omx-plugin/lib/gb/libutils/Makefile.in
diff --git a/media/omx-plugin/lib/gb/libutils/moz.build b/media/omx-plugin/lib/gb/libutils/moz.build
@@ -19,3 +19,5 @@ LOCAL_INCLUDES += [
     '/media/omx-plugin/include/gb/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \

diff --git a/media/omx-plugin/lib/gb235/libstagefright/moz.build b/media/omx-plugin/lib/gb235/libstagefright/moz.build
@@ -19,3 +19,5 @@ LOCAL_INCLUDES += [
     '/media/omx-plugin/include/gb/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/lib/hc/libstagefright/Makefile.in b/media/omx-plugin/lib/hc/libstagefright/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \

diff --git a/media/omx-plugin/lib/hc/libstagefright/moz.build b/media/omx-plugin/lib/hc/libstagefright/moz.build
@@ -19,3 +19,5 @@ LOCAL_INCLUDES += [
     '/media/omx-plugin/include/gb/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/lib/ics/libstagefright/Makefile.in b/media/omx-plugin/lib/ics/libstagefright/Makefile.in
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Don't use STL wrappers; this isn't Gecko code
-STL_FLAGS =
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += \

diff --git a/media/omx-plugin/lib/ics/libstagefright/moz.build b/media/omx-plugin/lib/ics/libstagefright/moz.build
@@ -19,3 +19,5 @@ LOCAL_INCLUDES += [
     '/media/omx-plugin/include/ics/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
diff --git a/media/omx-plugin/lib/ics/libutils/Makefile.in b/media/omx-plugin/lib/ics/libutils/Makefile.in
diff --git a/media/omx-plugin/lib/ics/libutils/moz.build b/media/omx-plugin/lib/ics/libutils/moz.build
@@ -19,3 +19,5 @@ LOCAL_INCLUDES += [
     '/media/omx-plugin/include/ics/media/stagefright/openmax',
 ]
 
+# Don't use STL wrappers; this isn't Gecko code
+DISABLE_STL_WRAPPING = True
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,8 +28,6 @@ LIBS += \ @@
     endif
     endif
-    STL_FLAGS=
     LIBS += $(JEMALLOC_LIBS)
     LIBS += \
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,3 +41,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
		]

		LDFLAGS += ['-Wl,--export-dynamic']

		DISABLE_STL_WRAPPING = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,3 +52,4 @@ LOCAL_INCLUDES += [
		'stlport',
		]

		DISABLE_STL_WRAPPING = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,5 @@ if CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']:
		FORCE_STATIC_LIB = True

		NO_PGO = True

		DISABLE_STL_WRAPPING = True