Bug 940218 - Build memory/jemalloc and friends in unified mode. r=glandium
authorChris Peterson <cpeterson@mozilla.com>
Sun, 17 Nov 2013 01:16:36 -0800
changeset 156550 c3d41ab0a2dfe2d2e3ec22dfcbdbc178ffce6682
parent 156549 b79bbe912c561c7f4f45afef360eb169e3a41142
child 156551 3839e0c416d23691c2fbcb4b2e0f1ea1b42831bf
push id25684
push usercbook@mozilla.com
push dateThu, 21 Nov 2013 13:21:05 +0000
treeherdermozilla-central@7427eede548f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs940218
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 940218 - Build memory/jemalloc and friends in unified mode. r=glandium
memory/build/moz.build
memory/jemalloc/moz.build
memory/mozalloc/moz.build
--- a/memory/build/moz.build
+++ b/memory/build/moz.build
@@ -9,28 +9,28 @@ EXPORTS += [
     'mozmemory_wrap.h',
 ]
 
 if CONFIG['MOZ_REPLACE_MALLOC']:
     EXPORTS += [
         'malloc_decls.h',
         'replace_malloc.h',
     ]
-SOURCES += [
+UNIFIED_SOURCES += [
     'jemalloc_config.c',
     'mozmemory_wrap.c',
 ]
 
 if CONFIG['MOZ_JEMALLOC3']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'mozjemalloc_compat.c',
     ]
 
 if CONFIG['MOZ_REPLACE_MALLOC']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'replace_malloc.c',
     ]
 
 LIBRARY_NAME = 'memory'
 
 # Keep jemalloc separated when mozglue is statically linked
 if CONFIG['MOZ_MEMORY'] and (CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') or
                              CONFIG['MOZ_NATIVE_JEMALLOC']):
--- a/memory/jemalloc/moz.build
+++ b/memory/jemalloc/moz.build
@@ -1,15 +1,15 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'src/src/arena.c',
     'src/src/atomic.c',
     'src/src/base.c',
     'src/src/bitmap.c',
     'src/src/chunk.c',
     'src/src/chunk_dss.c',
     'src/src/chunk_mmap.c',
     'src/src/ckh.c',
@@ -27,15 +27,15 @@ SOURCES += [
     'src/src/tcache.c',
     'src/src/tsd.c',
     'src/src/util.c',
 ]
 
 # Only OSX needs the zone allocation implementation,
 # but only if replace-malloc is not enabled.
 if CONFIG['OS_TARGET'] == 'Darwin' and not CONFIG['MOZ_REPLACE_MALLOC']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'src/src/zone.c',
     ]
 
 LIBRARY_NAME = 'jemalloc'
 
 FORCE_STATIC_LIB = True
--- a/memory/mozalloc/moz.build
+++ b/memory/mozalloc/moz.build
@@ -27,17 +27,17 @@ if CONFIG['WRAP_STL_INCLUDES']:
                 'msvc_throw_wrapper.h',
                 'throw_msvc.h',
             ]
             SOURCES += [
                 'msvc_raise_wrappers.cpp',
                 'msvc_throw_wrapper.cpp',
             ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'mozalloc.cpp',
     'mozalloc_abort.cpp',
     'mozalloc_oom.cpp',
 ]
 
 LIBRARY_NAME = 'mozalloc'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':