Bug 1423094 - Remove xpcom_staticruntime. r?build draft
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 05 Dec 2017 15:39:52 +0900
changeset 707351 0b0e7f59fab51744009a9906cc6d6f186d663ed0
parent 707349 bbec3abaff6c202f6af2cb8ef18a1e0fcbc4be54
child 707377 cde80f1c2e8b47c4d8afe442e87992687826dc17
push id92097
push userbmo:mh+mozilla@glandium.org
push dateTue, 05 Dec 2017 06:41:11 +0000
reviewersbuild
bugs1423094
milestone59.0a1
Bug 1423094 - Remove xpcom_staticruntime. r?build
xpcom/glue/standalone/moz.build
xpcom/glue/standalone/staticruntime/moz.build
--- a/xpcom/glue/standalone/moz.build
+++ b/xpcom/glue/standalone/moz.build
@@ -1,19 +1,14 @@
 # -*- 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/.
 
-# On win we build two glue libs - glue linked to crt dlls here and in staticruntime we build
-# a statically linked glue lib.
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DIRS += ['staticruntime']
-
 SOURCES += [
     '../FileUtils.cpp',
     'nsXPCOMGlue.cpp',
 ]
 
 Library('xpcomglue')
 
 FORCE_STATIC_LIB = True
deleted file mode 100644
--- a/xpcom/glue/standalone/staticruntime/moz.build
+++ /dev/null
@@ -1,44 +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/.
-
-SOURCES += [
-    '../../FileUtils.cpp',
-    '../nsXPCOMGlue.cpp',
-]
-
-Library('xpcomglue_staticruntime')
-
-# create a static lib
-FORCE_STATIC_LIB = True
-
-if CONFIG['_MSC_VER']:
-    DEFINES['_USE_ANSI_CPP'] = True
-    # Don't include directives about which CRT to use
-    CFLAGS += ['-Zl']
-    CXXFLAGS += ['-Zl']
-
-DEFINES['XPCOM_GLUE'] = True
-
-LOCAL_INCLUDES += [
-    '../../../build',
-    '../../../threads',
-]
-
-# Statically link to the CRT on Windows
-USE_STATIC_LIBS = True
-
-# Don't use STL wrappers here (i.e. wrapped <new>); they require mozalloc
-DisableStlWrapping()
-
-# Include fallible for third party code using the xpcom glue
-USE_LIBS += [
-    'fallible',
-]
-
-# Force to build a static library only
-NO_EXPAND_LIBS = True
-
-DIST_INSTALL = True