Bug 1423094 - Remove mozalloc_staticruntime. r?build draft
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 05 Dec 2017 15:39:39 +0900
changeset 707349 bbec3abaff6c202f6af2cb8ef18a1e0fcbc4be54
parent 707348 8d3a3f586b9e8809ab328eadd3d04af61461f71d
child 707350 240e53362a3f3713726e6248870354ea3481f25b
child 707351 0b0e7f59fab51744009a9906cc6d6f186d663ed0
push id92096
push userbmo:mh+mozilla@glandium.org
push dateTue, 05 Dec 2017 06:40:33 +0000
reviewersbuild
bugs1423094
milestone59.0a1
Bug 1423094 - Remove mozalloc_staticruntime. r?build
memory/mozalloc/moz.build
memory/mozalloc/staticruntime/moz.build
--- a/memory/mozalloc/moz.build
+++ b/memory/mozalloc/moz.build
@@ -43,17 +43,14 @@ FINAL_LIBRARY = 'mozglue'
 
 # The strndup declaration in string.h is in an ifdef __USE_GNU section
 DEFINES['_GNU_SOURCE'] = True
 
 DisableStlWrapping()
 
 DEFINES['IMPL_MFBT'] = True
 
-if CONFIG['_MSC_VER']:
-    DIRS += ['staticruntime']
-
 LOCAL_INCLUDES += [
     '!/xpcom',
     '/memory/build',
 ]
 
 DIST_INSTALL = True
deleted file mode 100644
--- a/memory/mozalloc/staticruntime/moz.build
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: python; 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/.
-
-NoVisibilityFlags()
-
-if CONFIG['WRAP_STL_INCLUDES']:
-    DEFINES['_HAS_EXCEPTIONS'] = 0
-    if CONFIG['MOZ_MSVC_STL_WRAP_RAISE']:
-        SOURCES += [
-            '../msvc_raise_wrappers.cpp',
-        ]
-
-UNIFIED_SOURCES += [
-    '../mozalloc.cpp',
-    '../mozalloc_abort.cpp',
-    '../mozalloc_oom.cpp',
-]
-
-# Keep this file separate to avoid #include'ing windows.h everywhere.
-SOURCES += [
-    '../winheap.cpp',
-]
-
-LOCAL_INCLUDES += ['!/xpcom']
-
-DisableStlWrapping()
-
-DEFINES['IMPL_MFBT'] = True
-
-USE_STATIC_LIBS = True
-
-Library('mozalloc_staticruntime')