mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 07:13:20 +00:00
Bug 976896 - Port STL_FLAGS to moz.build; r=mshal
This commit is contained in:
Ehsan Akhgari
parent
08a11f7934
commit
17f4a32d8b
@ -28,8 +28,6 @@ LIBS += \
|
||||
endif
|
||||
endif
|
||||
|
||||
STL_FLAGS=
|
||||
|
||||
LIBS += $(JEMALLOC_LIBS)
|
||||
|
||||
LIBS += \
|
||||
|
||||
@ -41,3 +41,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
]
|
||||
|
||||
LDFLAGS += ['-Wl,--export-dynamic']
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -26,8 +26,6 @@ endif #} LIBXUL_SDK
|
||||
|
||||
# Build a binary bootstrapping with XRE_main
|
||||
|
||||
STL_FLAGS=
|
||||
|
||||
LIBS += \
|
||||
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
|
||||
$(NULL)
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -52,3 +52,4 @@ LOCAL_INCLUDES += [
|
||||
'stlport',
|
||||
]
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -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
|
||||
|
||||
@ -17,3 +17,5 @@ if CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']:
|
||||
FORCE_STATIC_LIB = True
|
||||
|
||||
NO_PGO = True
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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']
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -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
|
||||
|
||||
@ -31,3 +31,5 @@ else:
|
||||
#
|
||||
# Set it to 256k. See bug 127069.
|
||||
LDFLAGS += ['/HEAP:0x40000']
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# 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 =
|
||||
@ -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
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
# Copyright 2012 Mozilla Foundation and Mozilla contributors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# 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 =
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
INCLUDES += \
|
||||
|
||||
@ -13,3 +13,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
|
||||
LIBRARY_NAME = 'videoeditorplayer'
|
||||
|
||||
FORCE_SHARED_LIB = True
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -53,3 +53,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
'hardware/libhardware/include',
|
||||
]
|
||||
]
|
||||
|
||||
# Don't use STL wrappers; this isn't Gecko code
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -54,7 +54,8 @@
|
||||
* Makefile.in:
|
||||
* MOZ_GLUE_LDFLAGS = # Don't link against mozglue
|
||||
* WRAP_LDFLAGS = # Never wrap malloc function calls with -Wl,--wrap
|
||||
* STL_FLAGS = # Avoid STL wrapping
|
||||
* and the following to the implementation's moz.build:
|
||||
* DISABLE_STL_WRAPPING = True # Avoid STL wrapping
|
||||
*
|
||||
* If your replace-malloc implementation lives under memory/replace, these
|
||||
* are taken care of by memory/replace/defs.mk.
|
||||
|
||||
@ -3,11 +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/.
|
||||
|
||||
STL_FLAGS =
|
||||
ifdef _MSC_VER
|
||||
STL_FLAGS = -D_HAS_EXCEPTIONS=0
|
||||
endif
|
||||
|
||||
DIST_INSTALL = 1
|
||||
|
||||
ifneq (,$(filter WINNT,$(OS_ARCH)))
|
||||
|
||||
@ -22,6 +22,7 @@ if CONFIG['WRAP_STL_INCLUDES']:
|
||||
if CONFIG['GNU_CXX']:
|
||||
EXPORTS.mozilla += ['throw_gcc.h']
|
||||
elif CONFIG['_MSC_VER']:
|
||||
DEFINES['_HAS_EXCEPTIONS'] = 0
|
||||
if build_msvc_wrappers:
|
||||
EXPORTS.mozilla += [
|
||||
'msvc_raise_wrappers.h',
|
||||
@ -69,3 +70,5 @@ DEFINES['_GNU_SOURCE'] = True
|
||||
TEST_TOOL_DIRS += ['tests']
|
||||
|
||||
GENERATED_INCLUDES += ['/xpcom']
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
MOZ_GLUE_LDFLAGS = # Don't link against mozglue
|
||||
WRAP_LDFLAGS = # Never wrap malloc function calls with -Wl,--wrap
|
||||
STL_FLAGS = # Avoid STL wrapping
|
||||
|
||||
@ -7,8 +7,6 @@
|
||||
WRAP_LDFLAGS =
|
||||
MOZ_GLUE_LDFLAGS=
|
||||
|
||||
STL_FLAGS =
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,dbghelp)
|
||||
endif
|
||||
|
||||
@ -26,3 +26,5 @@ DEFINES['MOZ_NO_MOZALLOC'] = True
|
||||
|
||||
if CONFIG['MOZ_OPTIMIZE']:
|
||||
DEFINES['MOZ_OPTIMIZE'] = True
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -12,3 +12,5 @@ SOURCES += [
|
||||
LIBRARY_NAME = 'replace_malloc'
|
||||
|
||||
FORCE_SHARED_LIB = True
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -28,3 +28,5 @@ DEFINES['MOZ_REPLACE_JEMALLOC'] = True
|
||||
GENERATED_INCLUDES += ['../../jemalloc/src/include']
|
||||
if CONFIG['_MSC_VER']:
|
||||
LOCAL_INCLUDES += ['/memory/jemalloc/src/include/msvc_compat']
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -7,3 +7,5 @@
|
||||
# Build jemalloc3 as a replace-malloc lib when building with mozjemalloc
|
||||
if not CONFIG['MOZ_JEMALLOC']:
|
||||
DIRS += ['jemalloc']
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# 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 =
|
||||
|
||||
@ -89,3 +89,5 @@ SOURCES += [
|
||||
'Compression.cpp',
|
||||
'decimal/Decimal.cpp',
|
||||
]
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -2,8 +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 =
|
||||
|
||||
# in order to prevent rules.mk from trying to link to libraries that are
|
||||
# not available to MFBT, we have to reset these MOZ_GLUE*_LDFLAGS before including it
|
||||
# and LIBS_ after including it. For WRAP_LDFLAGS, it shouldn't matter.
|
||||
|
||||
@ -29,3 +29,5 @@ if not CONFIG['MOZ_ASAN']:
|
||||
|
||||
# Since we link directly with MFBT object files, define IMPL_MFBT
|
||||
DEFINES['IMPL_MFBT'] = True
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -8,8 +8,6 @@ PREF_JS_EXPORTS = $(srcdir)/mobile.js
|
||||
|
||||
ifndef LIBXUL_SDK
|
||||
ifneq (Android,$(OS_TARGET))
|
||||
STL_FLAGS=
|
||||
|
||||
LIBS += \
|
||||
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
|
||||
$(NULL)
|
||||
|
||||
@ -14,6 +14,7 @@ if not CONFIG['LIBXUL_SDK']:
|
||||
'/xpcom/base',
|
||||
'/xpcom/build',
|
||||
]
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
for var in ('APP_NAME', 'APP_VERSION'):
|
||||
DEFINES[var] = CONFIG['MOZ_%s' % var]
|
||||
|
||||
@ -2,8 +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=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
prcpucfg.h: $(topsrcdir)/nsprpub/pr/include/md/_linux.cfg
|
||||
|
||||
@ -48,3 +48,5 @@ LOCAL_INCLUDES += [
|
||||
'/toolkit/components/startup',
|
||||
'/xpcom/build',
|
||||
]
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -50,8 +50,6 @@ EXTRA_DSO_LDOPTS += \
|
||||
$(call EXPAND_LIBNAME,version) \
|
||||
$(NULL)
|
||||
|
||||
STL_FLAGS=
|
||||
|
||||
endif
|
||||
|
||||
ifeq (Darwin_1,$(OS_TARGET)_$(MOZ_REPLACE_MALLOC))
|
||||
|
||||
@ -32,6 +32,7 @@ if CONFIG['OS_TARGET'] == 'WINNT':
|
||||
'WindowsDllBlocklist.cpp',
|
||||
]
|
||||
DEFFILE = 'mozglue.def'
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
if CONFIG['MOZ_NUWA_PROCESS']:
|
||||
EXPORTS.ipc += [
|
||||
|
||||
@ -2,8 +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 =
|
||||
|
||||
HOST_LIBS = -lz
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -24,3 +24,5 @@ HOST_PROGRAM = 'szip'
|
||||
FINAL_LIBRARY = 'mozglue'
|
||||
|
||||
DEFINES['IMPL_MFBT'] = True
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -3,8 +3,6 @@
|
||||
# You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
ifdef MOZ_LINKER
|
||||
STL_FLAGS =
|
||||
|
||||
# Only link against the linker, not mozglue
|
||||
MOZ_GLUE_PROGRAM_LDFLAGS =
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
|
||||
@ -15,3 +15,4 @@ if CONFIG['MOZ_LINKER']:
|
||||
'TestZip',
|
||||
]
|
||||
LOCAL_INCLUDES += ['../linker']
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# 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/.
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
STL_FLAGS =
|
||||
@ -13,3 +13,5 @@ LIBRARY_NAME = 'profdirserviceprovidersa_s'
|
||||
FORCE_STATIC_LIB = True
|
||||
|
||||
DEFINES['XPCOM_GLUE'] = 1
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -217,6 +217,7 @@ class TreeMetadataEmitter(LoggingMixin):
|
||||
'ANDROID_GENERATED_RESFILES',
|
||||
'ANDROID_RES_DIRS',
|
||||
'CPP_UNIT_TESTS',
|
||||
'DISABLE_STL_WRAPPING',
|
||||
'EXPORT_LIBRARY',
|
||||
'EXTRA_ASSEMBLER_FLAGS',
|
||||
'EXTRA_COMPILE_FLAGS',
|
||||
|
||||
@ -178,6 +178,11 @@ VARIABLES = {
|
||||
delimiters.
|
||||
""", None),
|
||||
|
||||
'DISABLE_STL_WRAPPING': (bool, bool,
|
||||
"""Disable the wrappers for STL which allow it to work with C++ exceptions
|
||||
disabled.
|
||||
""", 'binaries'),
|
||||
|
||||
'EXPORT_LIBRARY': (bool, bool,
|
||||
"""Install the library to the static libraries folder.
|
||||
""", None),
|
||||
|
||||
@ -47,3 +47,5 @@ CFLAGS += ['-fno-exceptions', '-w']
|
||||
CXXFLAGS += ['-fcxx-exceptions', '-include foo.h']
|
||||
LDFLAGS += ['-framework Foo', '-x']
|
||||
WIN32_EXE_LDFLAGS += ['-subsystem:console']
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -269,6 +269,9 @@ class TestRecursiveMakeBackend(BackendTester):
|
||||
'CSRCS += bar.c',
|
||||
'CSRCS += foo.c',
|
||||
],
|
||||
'DISABLE_STL_WRAPPING': [
|
||||
'DISABLE_STL_WRAPPING := 1',
|
||||
],
|
||||
'EXTRA_COMPONENTS': [
|
||||
'EXTRA_COMPONENTS += bar.js',
|
||||
'EXTRA_COMPONENTS += foo.js',
|
||||
|
||||
@ -53,3 +53,5 @@ CFLAGS += ['-fno-exceptions', '-w']
|
||||
CXXFLAGS += ['-fcxx-exceptions', '-include foo.h']
|
||||
LDFLAGS += ['-framework Foo', '-x']
|
||||
WIN32_EXE_LDFLAGS += ['-subsystem:console']
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -151,6 +151,7 @@ class TestEmitterBasic(unittest.TestCase):
|
||||
CMMSRCS=['fans.mm', 'tans.mm'],
|
||||
CSRCS=['fans.c', 'tans.c'],
|
||||
CPP_UNIT_TESTS=['foo.cpp'],
|
||||
DISABLE_STL_WRAPPING=True,
|
||||
EXPORT_LIBRARY=True,
|
||||
EXTRA_COMPONENTS=['fans.js', 'tans.js'],
|
||||
EXTRA_PP_COMPONENTS=['fans.pp.js', 'tans.pp.js'],
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
STL_FLAGS =
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
endif
|
||||
|
||||
|
||||
@ -128,3 +128,5 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
|
||||
LOCAL_INCLUDES += ['/security/sandbox/chromium']
|
||||
LOCAL_INCLUDES += ['/security']
|
||||
LOCAL_INCLUDES += ['/nsprpub']
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
STL_FLAGS =
|
||||
|
||||
SHARED_LIBRARY_LIBS += \
|
||||
../../../$(LIB_PREFIX)sandbox_s.$(LIB_SUFFIX) \
|
||||
|
||||
@ -27,3 +27,4 @@ LOCAL_INCLUDES += [
|
||||
'/security/sandbox/chromium',
|
||||
]
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -3,10 +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/.
|
||||
|
||||
# This isn't XPCOM code, but it wants to use STL, so disable the STL
|
||||
# wrappers
|
||||
STL_FLAGS =
|
||||
|
||||
LIBS = \
|
||||
$(NSPR_LIBS) \
|
||||
$(NSS_LIBS) \
|
||||
|
||||
@ -9,3 +9,7 @@ PROGRAM = 'ssltunnel'
|
||||
SOURCES += [
|
||||
'ssltunnel.cpp',
|
||||
]
|
||||
|
||||
# This isn't XPCOM code, but it wants to use STL, so disable the STL
|
||||
# wrappers
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -8,7 +8,6 @@ DIST_PROGRAM = maintenanceservice$(BIN_SUFFIX)
|
||||
# bug 725876
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
MOZ_GLUE_PROGRAM_LDFLAGS =
|
||||
STL_FLAGS=
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon-standalone,../../mozapps/update/common-standalone)
|
||||
|
||||
@ -34,3 +34,5 @@ if CONFIG['_MSC_VER']:
|
||||
WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
|
||||
|
||||
RCINCLUDE = 'maintenanceservice.rc'
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# 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 =
|
||||
@ -28,3 +28,5 @@ SOURCES += objs_common
|
||||
SOURCES += objs_crash_generation
|
||||
SOURCES += objs_handler
|
||||
SOURCES += objs_sender
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -3,5 +3,3 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
|
||||
STL_FLAGS =
|
||||
|
||||
@ -22,3 +22,5 @@ SOURCES += objs_crash_generation
|
||||
SOURCES += objs_handler
|
||||
|
||||
USE_STATIC_LIBS = True
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -3,10 +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 the STL wrappers in the crashreporter clients; they don't
|
||||
# link with -lmozalloc, and it really doesn't matter here anyway.
|
||||
STL_FLAGS =
|
||||
|
||||
ifneq ($(OS_TARGET),Android)
|
||||
DIST_PROGRAM = crashreporter$(BIN_SUFFIX)
|
||||
|
||||
|
||||
@ -44,3 +44,7 @@ if CONFIG['MOZ_ENABLE_GTK']:
|
||||
]
|
||||
|
||||
RCINCLUDE = 'crashreporter.rc'
|
||||
|
||||
# Don't use the STL wrappers in the crashreporter clients; they don't
|
||||
# link with -lmozalloc, and it really doesn't matter here anyway.
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -10,4 +10,4 @@ endif
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# See https://bugzilla.mozilla.org/show_bug.cgi?id=741348#c11
|
||||
file_id.$(OBJ_SUFFIX): STL_FLAGS=
|
||||
file_id.$(OBJ_SUFFIX): DISABLE_STL_WRAPPING := 1
|
||||
|
||||
@ -12,7 +12,7 @@ UNIFIED_SOURCES += [
|
||||
'safe_readlink.cc',
|
||||
]
|
||||
|
||||
# file_id.cc cannot be built in unified mode because it uses a custom STL_FLAGS
|
||||
# file_id.cc cannot be built in unified mode because it uses a custom DISABLE_STL_WRAPPING
|
||||
SOURCES += [
|
||||
'file_id.cc',
|
||||
]
|
||||
|
||||
@ -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 =
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -24,3 +24,5 @@ if CONFIG['GNU_CC']:
|
||||
LDFLAGS += ['-Wl,-e,_DummyEntryPoint@12']
|
||||
else:
|
||||
LDFLAGS += ['-ENTRY:DummyEntryPoint']
|
||||
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
@ -33,7 +33,6 @@ OS_LIBS += -framework Cocoa
|
||||
endif
|
||||
|
||||
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) #{
|
||||
STL_FLAGS =
|
||||
OS_LIBS += -lcutils -lsysutils
|
||||
# clear out all the --wrap flags and remove dependency on mozglue for Gonk
|
||||
WRAP_LDFLAGS :=
|
||||
|
||||
@ -44,6 +44,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
'automounter_gonk.cpp',
|
||||
'progressui_gonk.cpp',
|
||||
]
|
||||
DISABLE_STL_WRAPPING = True
|
||||
|
||||
if have_progressui == 0:
|
||||
SOURCES += [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user