Issue #1676 - Part 15: Split threading sources out of js/src/moz.build

This commit is contained in:
Matt A. Tobin 2020-11-04 14:11:22 -05:00 committed by roytam1
commit 81d575eff7
2 changed files with 32 additions and 15 deletions

View file

@ -11,6 +11,7 @@ CONFIGURE_SUBST_FILES += [
'js-config',
'js.pc',
]
CONFIGURE_DEFINE_FILES += [
'js-confdefs.h',
]
@ -111,6 +112,7 @@ DIRS += [
'jit',
'perf',
'proxy',
'threading',
]
if CONFIG['JS_BUNDLED_EDITLINE']:
@ -141,7 +143,6 @@ SOURCES += [
'jsscript.cpp',
'jsstr.cpp',
'jsweakmap.cpp',
'threading/Mutex.cpp',
'vm/ArgumentsObject.cpp',
'vm/ArrayBufferObject.cpp',
'vm/AsyncFunction.cpp',
@ -256,20 +257,6 @@ if CONFIG['ENABLE_TRACE_LOGGING']:
'vm/TraceLoggingTypes.cpp',
]
if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
'threading/windows/ConditionVariable.cpp',
'threading/windows/MutexImpl.cpp',
'threading/windows/Thread.cpp',
]
# _CRT_RAND_S must be #defined before #including stdlib.h to get rand_s()
else:
SOURCES += [
'threading/posix/ConditionVariable.cpp',
'threading/posix/MutexImpl.cpp',
'threading/posix/Thread.cpp',
]
if CONFIG['JS_HAS_CTYPES']:
SOURCES += [
'ctypes/CTypes.cpp',

View file

@ -0,0 +1,30 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# 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('../js-config.mozbuild')
include('../js-cxxflags.mozbuild')
FINAL_LIBRARY = "js"
# Includes should be relative to parent path
LOCAL_INCLUDES += ["!..", ".."]
SOURCES += [
'Mutex.cpp',
]
if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
'windows/ConditionVariable.cpp',
'windows/MutexImpl.cpp',
'windows/Thread.cpp',
]
# _CRT_RAND_S must be #defined before #including stdlib.h to get rand_s()
else:
SOURCES += [
'posix/ConditionVariable.cpp',
'posix/MutexImpl.cpp',
'posix/Thread.cpp',
]