corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1658434 - Replace replace_malloc.mk with a mozbuild file. r=nalexander

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D86639
This commit is contained in:
Mike Hommey
2020-08-11 00:05:38 +00:00
parent cab74fff55
commit 4b18a40fb6
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.mk
View File

@@ -175,7 +175,7 @@ MOZ_LTO_CFLAGS :=
MOZ_LTO_LDFLAGS := MOZ_LTO_LDFLAGS :=
endif endif
LDFLAGS = $(MOZ_LTO_LDFLAGS) $(COMPUTED_LDFLAGS) $(PGO_LDFLAGS) $(MK_LDFLAGS) LDFLAGS = $(MOZ_LTO_LDFLAGS) $(COMPUTED_LDFLAGS) $(PGO_LDFLAGS)
COMPILE_CFLAGS = $(MOZ_LTO_CFLAGS) $(COMPUTED_CFLAGS) $(PGO_CFLAGS) $(_DEPEND_CFLAGS) $(MK_COMPILE_DEFINES) COMPILE_CFLAGS = $(MOZ_LTO_CFLAGS) $(COMPUTED_CFLAGS) $(PGO_CFLAGS) $(_DEPEND_CFLAGS) $(MK_COMPILE_DEFINES)
COMPILE_CXXFLAGS = $(MOZ_LTO_CFLAGS) $(COMPUTED_CXXFLAGS) $(PGO_CFLAGS) $(_DEPEND_CFLAGS) $(MK_COMPILE_DEFINES) COMPILE_CXXFLAGS = $(MOZ_LTO_CFLAGS) $(COMPUTED_CXXFLAGS) $(PGO_CFLAGS) $(_DEPEND_CFLAGS) $(MK_COMPILE_DEFINES)

2
memory/replace/logalloc/replay/Makefile.in
View File

@@ -2,8 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/mozglue/build/replace_malloc.mk
ifndef CROSS_COMPILE ifndef CROSS_COMPILE
ifndef MOZ_CODE_COVERAGE ifndef MOZ_CODE_COVERAGE

2
memory/replace/logalloc/replay/moz.build
View File

@@ -60,3 +60,5 @@ if CONFIG['MOZ_NEEDS_LIBATOMIC']:
OS_LIBS += ['atomic'] OS_LIBS += ['atomic']
DisableStlWrapping() DisableStlWrapping()
include('/mozglue/build/replace_malloc.mozbuild')

2
mozglue/build/Makefile.in
View File

@@ -13,5 +13,3 @@ ifeq (WINNT,$(OS_TARGET))
# here. # here.
EXTRA_DEPS += $(srcdir)/mozglue.dll.manifest EXTRA_DEPS += $(srcdir)/mozglue.dll.manifest
endif endif
include $(topsrcdir)/mozglue/build/replace_malloc.mk

2
mozglue/build/moz.build
View File

@@ -116,3 +116,5 @@ if CONFIG['MOZ_LINKER'] and CONFIG['CPU_ARCH'] == 'arm':
LDFLAGS += ['-Wl,-version-script,%s/arm-eabi-filter' % SRCDIR] LDFLAGS += ['-Wl,-version-script,%s/arm-eabi-filter' % SRCDIR]
DIST_INSTALL = True DIST_INSTALL = True
include('replace_malloc.mozbuild')

5
mozglue/build/replace_malloc.mk → mozglue/build/replace_malloc.mozbuild
View File

@@ -2,6 +2,5 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
ifeq (Darwin_1,$(OS_TARGET)_$(MOZ_REPLACE_MALLOC)) if CONFIG['OS_TARGET'] == 'Darwin' and CONFIG['MOZ_REPLACE_MALLOC']:
MK_LDFLAGS = -Wl,-U,_replace_init LDFLAGS += ['-Wl,-U,_replace_init']
endif