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',