Bug 1315939 - Use FINAL_LIBRARY = 'memory' in jemalloc and mozjemalloc. r=glandium

--HG--
extra : rebase_source : 94d19e08090839537ca5174baa8b37993d108acc

memory/build/moz.build

@@ -9,7 +9,7 @@ EXPORTS += [
     'mozmemory_wrap.h',
 ]
 
-DEFINES['MOZ_HAS_MOZGLUE'] = True
+LIBRARY_DEFINES['MOZ_HAS_MOZGLUE'] = True
 DEFINES['MOZ_MEMORY_IMPL'] = True
 
 if CONFIG['MOZ_REPLACE_MALLOC']:
@@ -41,16 +41,6 @@ if CONFIG['MOZ_REPLACE_MALLOC']:
 
 Library('memory')
 
-if CONFIG['MOZ_JEMALLOC4']:
-    if not CONFIG['MOZ_SYSTEM_JEMALLOC']:
-        USE_LIBS += [
-            'jemalloc',
-        ]
-else:
-    USE_LIBS += [
-        'mozjemalloc',
-    ]
-
 if CONFIG['MOZ_GLUE_IN_PROGRAM']:
     SDK_LIBRARY = True
     DIST_INSTALL = True

memory/jemalloc/moz.build

@@ -46,9 +46,10 @@ if CONFIG['OS_TARGET'] == 'Darwin' and not CONFIG['MOZ_REPLACE_MALLOC']:
         'src/src/zone.c',
     ]
 
-Library('jemalloc')
-
-FORCE_STATIC_LIB = True
+if CONFIG['MOZ_JEMALLOC4']:
+    FINAL_LIBRARY = 'memory'
+else:
+    FINAL_LIBRARY = 'replace_jemalloc'
 
 if CONFIG['MOZ_GLUE_IN_PROGRAM']:
     SDK_LIBRARY = True
@@ -68,7 +69,6 @@ if CONFIG['GNU_CC']:
     CFLAGS += ['-std=gnu99']
 
 DEFINES['abort'] = 'moz_abort'
-DEFINES['MOZ_HAS_MOZGLUE'] = True
 
 LOCAL_INCLUDES += [
     '!src/include',

memory/mozjemalloc/moz.build

@@ -12,9 +12,7 @@ if not CONFIG['MOZ_JEMALLOC4']:
     SOURCES += [
         'jemalloc.c',
     ]
-    Library('mozjemalloc')
-    STATIC_LIBRARY_NAME = 'jemalloc'
-    FORCE_STATIC_LIB = True
+    FINAL_LIBRARY = 'memory'
 
     # See bug 422055.
     if CONFIG['OS_ARCH'] == 'SunOS' and not CONFIG['GNU_CC'] \
@@ -28,7 +26,6 @@ if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('release', 'esr'):
 
 DEFINES['abort'] = 'moz_abort'
 
-DEFINES['MOZ_HAS_MOZGLUE'] = True
 DEFINES['MOZ_JEMALLOC_IMPL'] = True
 
 #XXX: PGO on Linux causes problems here

memory/replace/jemalloc/moz.build

@@ -19,10 +19,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
 
 SharedLibrary('replace_jemalloc')
 
-USE_LIBS += [
-    'jemalloc',
-]
-
 DEFINES['MOZ_JEMALLOC4'] = True
 DEFINES['MOZ_REPLACE_JEMALLOC'] = True