From 2f50f543a245a559a277505dfa6906f1888ef0d9 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Wed, 4 Nov 2020 14:11:22 -0500
Subject: Issue #1676 - Part 15: Split threading sources out of
 js/src/moz.build

---
 js/src/moz.build           | 17 ++---------------
 js/src/threading/moz.build | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 15 deletions(-)
 create mode 100644 js/src/threading/moz.build

(limited to 'js')

diff --git a/js/src/moz.build b/js/src/moz.build
index ceadfa3fd..e7832709d 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 000000000..97673d0c6
--- /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
-- 
cgit v1.2.3