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

Differential Revision: https://phabricator.services.mozilla.com/D86639

config/config.mk

@@ -175,7 +175,7 @@ MOZ_LTO_CFLAGS :=
 MOZ_LTO_LDFLAGS :=
 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_CXXFLAGS = $(MOZ_LTO_CFLAGS) $(COMPUTED_CXXFLAGS) $(PGO_CFLAGS) $(_DEPEND_CFLAGS) $(MK_COMPILE_DEFINES)

memory/replace/logalloc/replay/Makefile.in

@@ -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/.
 
-include $(topsrcdir)/mozglue/build/replace_malloc.mk
-
 ifndef CROSS_COMPILE
 ifndef MOZ_CODE_COVERAGE
 

memory/replace/logalloc/replay/moz.build

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

mozglue/build/Makefile.in

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

mozglue/build/moz.build

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

mozglue/build/replace_malloc.mk → mozglue/build/replace_malloc.mozbuild

@@ -2,6 +2,5 @@
 # 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/.
 
-ifeq (Darwin_1,$(OS_TARGET)_$(MOZ_REPLACE_MALLOC))
-MK_LDFLAGS = -Wl,-U,_replace_init
-endif
+if CONFIG['OS_TARGET'] == 'Darwin' and CONFIG['MOZ_REPLACE_MALLOC']:
+    LDFLAGS += ['-Wl,-U,_replace_init']