From 6c5ab3284596115128a1d3f44e87d79e81e08b16 Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Sun, 17 Nov 2013 01:16:36 -0800
Subject: [PATCH] Bug 940218 - Build memory/jemalloc and friends in unified
 mode. r=glandium

---
 memory/build/moz.build    | 6 +++---
 memory/jemalloc/moz.build | 4 ++--
 memory/mozalloc/moz.build | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/memory/build/moz.build b/memory/build/moz.build
index f933a886a9c..034f261adfe 100644
--- a/memory/build/moz.build
+++ b/memory/build/moz.build
@@ -14,18 +14,18 @@ if CONFIG['MOZ_REPLACE_MALLOC']:
         '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',
     ]
 
diff --git a/memory/jemalloc/moz.build b/memory/jemalloc/moz.build
index b40f981b450..3e246c9fa32 100644
--- a/memory/jemalloc/moz.build
+++ b/memory/jemalloc/moz.build
@@ -4,7 +4,7 @@
 # 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',
@@ -32,7 +32,7 @@ SOURCES += [
 # 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',
     ]
 
diff --git a/memory/mozalloc/moz.build b/memory/mozalloc/moz.build
index 0f20f6d51ac..99cfff9630a 100644
--- a/memory/mozalloc/moz.build
+++ b/memory/mozalloc/moz.build
@@ -32,7 +32,7 @@ if CONFIG['WRAP_STL_INCLUDES']:
                 'msvc_throw_wrapper.cpp',
             ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'mozalloc.cpp',
     'mozalloc_abort.cpp',
     'mozalloc_oom.cpp',