Disable wasm32-wasip1-threads in wasmswiftsdk.py

Author: MaxDesiatov

utils/swift_build_support/swift_build_support/products/wasmswiftsdk.py

@@ -224,17 +224,17 @@ def build(self, host_target):
             build_root, '%s-%s' % ('wasmllvmruntimelibs', host_target))
 
         target_packages = []
-        # NOTE: We have two types of target triples:
+        # NOTE: We have three types of target triples:
         # 1. swift_host_triple: The triple used by the Swift compiler's '-target' option
         # 2. clang_multiarch_triple: The triple used by Clang to find library
         #    and header paths from the sysroot
         #    https://github.com/llvm/llvm-project/blob/73ef397fcba35b7b4239c00bf3e0b4e689ca0add/clang/lib/Driver/ToolChains/WebAssembly.cpp#L29-L36
-        for swift_host_triple, clang_multiarch_triple, build_basename, build_sdk, has_pthread in [
-            ('wasm32-unknown-wasi', 'wasm32-wasi', 'wasmstdlib', True, False),
-            # TODO: Include p1-threads in the Swift SDK once sdk-generator supports multi-target SDK
-            ('wasm32-unknown-wasip1-threads', 'wasm32-wasip1-threads',
-             'wasmthreadsstdlib', False, True),
-        ]:
+        # 3. short_triple: The triple used by build-script to name the build directory
+        for swift_host_triple, clang_multiarch_triple, short_triple, build_basename in [
+            ('wasm32-unknown-wasi', 'wasm32-wasi', 'wasi-wasm32', 'wasmstdlib'),
+            # TODO: Enable threads stdlib once sdk-generator supports multi-target SDK
+            # ('wasm32-unknown-wasip1-threads', 'wasm32-wasip1-threads',
+            #  'wasip1-threads-wasm32', 'wasmthreadsstdlib'),
             stdlib_build_path = os.path.join(
                 build_root, '%s-%s' % (build_basename, host_target))
             wasi_sysroot = wasisysroot.WASILibc.sysroot_install_path(