Bug 1306329 - Don't build the dependent XPCOM glue. r=glandium draft
authorBenjamin Smedberg <benjamin@smedbergs.us>
Wed, 26 Oct 2016 13:55:51 -0400
changeset 460834 5ede99e20d917eb22e8907046f4c7830f702147c
parent 460833 d8c243ebcc58fa9b00fbf599016517e500491c7f
child 460835 a85c8313b585eb8153161bc9e6c52c2aa33c3573
child 463417 4f606db695ed9e286822bab71ea3c519d38af90e
push id41509
push userbmo:mh+mozilla@glandium.org
push dateFri, 13 Jan 2017 22:54:07 +0000
reviewersglandium
bugs1306329
milestone53.0a1
Bug 1306329 - Don't build the dependent XPCOM glue. r=glandium
xpcom/glue/moz.build
xpcom/glue/staticruntime/moz.build
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -4,21 +4,16 @@
 # 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/.
 
 with Files('nsString*'):
     BUG_COMPONENT = ('Core', 'String')
 
 DIRS += ['standalone']
 
-# 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']
-
 EXPORTS += [
     'MainThreadUtils.h',
     'nsArrayEnumerator.h',
     'nsArrayUtils.h',
     'nsBaseHashtable.h',
     'nsCategoryCache.h',
     'nsClassHashtable.h',
     'nsCOMArray.h',
@@ -76,47 +71,10 @@ EXPORTS.mozilla += [
     'GenericFactory.h',
     'IntentionalCrash.h',
     'Monitor.h',
     'Mutex.h',
     'Observer.h',
     'ReentrantMonitor.h',
 ]
 
-include('objs.mozbuild')
-
-UNIFIED_SOURCES += xpcom_gluens_src_cppsrcs
-UNIFIED_SOURCES += xpcom_glue_src_cppsrcs
-
-UNIFIED_SOURCES += [
-    'GenericModule.cpp',
-    'nsStringAPI.cpp',
-]
-
-Library('xpcomglue_s')
-
-SDK_LIBRARY = True
-
-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']
-
-LOCAL_INCLUDES += [
-    '../build',
-    '../threads',
-]
-
 if CONFIG['ENABLE_TESTS']:
     DIRS += ['tests/gtest']
-
-# 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
deleted file mode 100644
--- a/xpcom/glue/staticruntime/moz.build
+++ /dev/null
@@ -1,48 +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/.
-
-include('../objs.mozbuild')
-
-UNIFIED_SOURCES += xpcom_gluens_src_cppsrcs
-UNIFIED_SOURCES += xpcom_glue_src_cppsrcs
-
-UNIFIED_SOURCES += [
-    '../GenericModule.cpp',
-    '../nsStringAPI.cpp',
-]
-
-Library('xpcomglue_staticruntime_s')
-
-SDK_LIBRARY = True
-
-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']
-
-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
-DISABLE_STL_WRAPPING = True
-
-# 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