[build-script] Add module ABI name prefix to swift-syntax libraries

rintaro · rintaro · commit ad81ad35fd07 · 2023-10-16T12:14:25.000-07:00
Add 'Compiler' prefix to ABI names of swift-syntax libraries so that compiler libraries (e.g. sourcekitdInProc) can be used from binaries linking with swift-syntax (e.g. via SwiftPM) swiftlang#68812 rdar://116951101
diff --git a/test/Macros/macro_plugin_error.swift b/test/Macros/macro_plugin_error.swift
@@ -34,7 +34,7 @@ func test() {
   // FIXME: Should be more user friendly message.
 
   let _: String = #fooMacro(1)
-  // expected-error @-1 {{typeMismatch(SwiftCompilerPluginMessageHandling.PluginToHostMessage}}
+  // expected-error @-1 {{typeMismatch(CompilerSwiftCompilerPluginMessageHandling.PluginToHostMessage}}
   let _: String = #fooMacro(2)
   // expected-error @-1 {{failed to receive result from plugin (from macro 'fooMacro')}}
   let _: String = #fooMacro(3)
diff --git a/utils/build-windows-toolchain.bat b/utils/build-windows-toolchain.bat
@@ -214,6 +214,8 @@ cmake ^
 
   -D CMAKE_INSTALL_PREFIX="%InstallRoot%" ^
 
+  -D SWIFT_MODULE_ABI_NAME_PREFIX="Compiler" ^
+
   -G Ninja ^
   -S %SourceRoot%\swift-syntax || (exit /b)
 cmake --build %BuildRoot%\99 || (exit /b)
diff --git a/utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py b/utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py
@@ -63,6 +63,7 @@ def build(self, host_target):
         self.cmake_options.define('CMAKE_INSTALL_PREFIX:PATH', self.args.install_prefix)
         self.cmake_options.define('SWIFTSYNTAX_ENABLE_ASSERTIONS:BOOL',
                                   self.args.assertions)
+        self.cmake_options.define('SWIFT_MODULE_ABI_NAME_PREFIX:STRING', 'Compiler')
         self.build_with_cmake(["all"], self.args.swift_build_variant, [])
 
     def should_test(self, host_target):
