diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-11-04 14:11:22 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-11-04 14:11:22 -0500 |
| commit | 2f50f543a245a559a277505dfa6906f1888ef0d9 (patch) | |
| tree | ce32d642548673e6bf3073dbc26a9ac68be71e57 | |
| parent | 6f76f1cb362b98fc617c5c0735cdacee64103e89 (diff) | |
| download | uxp-2f50f543a245a559a277505dfa6906f1888ef0d9.tar.gz | |
Issue #1676 - Part 15: Split threading sources out of js/src/moz.build
| -rw-r--r-- | js/src/moz.build | 17 | ||||
| -rw-r--r-- | js/src/threading/moz.build | 30 |
2 files changed, 32 insertions, 15 deletions
diff --git a/js/src/moz.build b/js/src/moz.build index ceadfa3fd2..e7832709d8 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -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', diff --git a/js/src/threading/moz.build b/js/src/threading/moz.build new file mode 100644 index 0000000000..97673d0c62 --- /dev/null +++ b/js/src/threading/moz.build @@ -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', + ]
\ No newline at end of file |