Merge pull request #2054 from swiftwasm/cherry-pick-93e3e18

Set compiler vendor name as SwiftWasm

Author: kateinoigakukun

utils/build-presets.ini

@@ -2446,6 +2446,7 @@ llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-h
 install-swift
 install-llvm
 install-prefix=/%(TOOLCHAIN_NAME)s/usr
+compiler-vendor=swiftwasm
 
 [preset: webassembly-host]
 

utils/build_swift/build_swift/driver_arguments.py

@@ -413,7 +413,7 @@ def create_argument_parser():
                 'fuzzing swiftc')
 
     option('--compiler-vendor', store,
-           choices=['none', 'apple'],
+           choices=['none', 'apple', 'swiftwasm'],
            default=defaults.COMPILER_VENDOR,
            help='Compiler vendor name')
     option('--clang-compiler-version', store,

utils/swift_build_support/swift_build_support/products/llvm.py

@@ -39,6 +39,13 @@ def _compiler_vendor_flags(self):
         if self.args.compiler_vendor == "none":
             return []
 
+        if self.args.compiler_vendor == "swiftwasm":
+            return [
+                ('CLANG_VENDOR', 'SwiftWasm'),
+                ('CLANG_VENDOR_UTI', 'org.swiftwasm.compilers.llvm.clang'),
+                ('PACKAGE_VERSION', str(self.args.clang_user_visible_version))
+            ]
+
         if self.args.compiler_vendor != "apple":
             raise RuntimeError("Unknown compiler vendor?!")
 

utils/swift_build_support/swift_build_support/products/swift.py

@@ -59,14 +59,22 @@ def _compiler_vendor_flags(self):
         if self.args.compiler_vendor == "none":
             return []
 
-        if self.args.compiler_vendor != "apple":
-            raise RuntimeError("Unknown compiler vendor?! Was build-script \
-updated without updating swift.py?")
-
         swift_compiler_version = ""
         if self.args.swift_compiler_version is not None:
             swift_compiler_version = self.args.swift_compiler_version
 
+        if self.args.compiler_vendor == "swiftwasm":
+            return [
+                ('SWIFT_VENDOR', 'SwiftWasm'),
+                ('SWIFT_VENDOR_UTI', 'org.swiftwasm.compilers.llvm.swift'),
+                ('SWIFT_VERSION', str(self.args.swift_user_visible_version)),
+                ('SWIFT_COMPILER_VERSION', str(swift_compiler_version)),
+            ]
+
+        if self.args.compiler_vendor != "apple":
+            raise RuntimeError("Unknown compiler vendor?! Was build-script \
+updated without updating swift.py?")
+
         return [
             ('SWIFT_VENDOR', 'Apple'),
             ('SWIFT_VENDOR_UTI', 'com.apple.compilers.llvm.swift'),