Bug 1423094 - Remove xpcom_staticruntime. r?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