From 15891ffef045aa46da444b53b3c8b5724b51d84e Mon Sep 17 00:00:00 2001
From: Benjamin Smedberg <benjamin@smedbergs.us>
Date: Wed, 26 Oct 2016 13:55:51 -0400
Subject: [PATCH] Bug 1306329 - Don't build the dependent XPCOM glue.
 r=glandium

MozReview-Commit-ID: jdOYo4Zv1l

--HG--
extra : rebase_source : 60eae5f77acdd588664b6997f800da0861e52bc5
extra : source : 6bb17b9a62d8ebeeaed80e87c14449b1d7dc6bb6
---
 xpcom/glue/moz.build               | 42 --------------------------
 xpcom/glue/staticruntime/moz.build | 48 ------------------------------
 2 files changed, 90 deletions(-)
 delete mode 100644 xpcom/glue/staticruntime/moz.build

diff --git a/xpcom/glue/moz.build b/xpcom/glue/moz.build
index e1a22dbe6c44..a3092d07f3e5 100644
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -9,11 +9,6 @@ with Files('nsString*'):
 
 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',
@@ -81,42 +76,5 @@ EXPORTS.mozilla += [
     '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
diff --git a/xpcom/glue/staticruntime/moz.build b/xpcom/glue/staticruntime/moz.build
deleted file mode 100644
index 384bc6878f4b..000000000000
--- 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