diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-09-05 13:13:49 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-09-05 13:13:49 +0000 |
| commit | e17072f3ef49089bad2aed71daa04ab6adca787d (patch) | |
| tree | 7cc389dafec614948dc54b069c90cd98a6f13406 /js/src/moz.build | |
| parent | b2ac2b28e007d1058911011b916344ba526caabc (diff) | |
| download | uxp-e17072f3ef49089bad2aed71daa04ab6adca787d.tar.gz | |
Revert "Issue #1676 - Part 15: Split threading sources out of js/src/moz.build"
This reverts commit 2f50f543a245a559a277505dfa6906f1888ef0d9.
Diffstat (limited to 'js/src/moz.build')
| -rw-r--r-- | js/src/moz.build | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/js/src/moz.build b/js/src/moz.build index db1b9ba2c9..a46f9a0086 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -11,7 +11,6 @@ CONFIGURE_SUBST_FILES += [ 'js-config', 'js.pc', ] - CONFIGURE_DEFINE_FILES += [ 'js-confdefs.h', ] @@ -112,7 +111,6 @@ DIRS += [ 'jit', 'perf', 'proxy', - 'threading', ] if CONFIG['JS_BUNDLED_EDITLINE']: @@ -146,6 +144,7 @@ SOURCES += [ 'jsscript.cpp', 'jsstr.cpp', 'jsweakmap.cpp', + 'threading/Mutex.cpp', 'vm/ArgumentsObject.cpp', 'vm/ArrayBufferObject.cpp', 'vm/AsyncFunction.cpp', @@ -260,6 +259,20 @@ 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', |