Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1306329 - Don't build the dependent XPCOM glue. r=glandium

Browse Source 
--HG--
extra : rebase_source : 918474e0f4c831db5ce2f3070414f928fa489ddb
This commit is contained in:
Benjamin Smedberg 2016-10-26 13:55:51 -04:00
parent 781499a7ac
commit 11e200c0c5
2 changed files with 0 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
xpcom/glue/moz.build
View File

@ -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

48
xpcom/glue/staticruntime/moz.build
View File

@ -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