Merge pull request #79426 from swiftlang/owenv/swift-build-toolchain-info

owenv · web-flow · commit f3239c3d9281 · 2025-02-17T18:52:03.000-08:00
Flesh out Windows ToolchainInfo.plist
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1693,7 +1693,7 @@ function Build-Compilers() {
       })
   }
 
-  Invoke-Program "$(Get-PythonExecutable)" -c "import plistlib; print(str(plistlib.dumps({ 'Identifier': '${ToolchainIdentifier}' }), encoding='utf-8'))" `
+  Invoke-Program "$(Get-PythonExecutable)" -c "import plistlib; print(str(plistlib.dumps({ 'Identifier': '${ToolchainIdentifier}', 'FallbackLibrarySearchPaths': ['usr/bin'], 'Version': '${ProductVersion}' }), encoding='utf-8'))" `
       -OutFile "$($Arch.ToolchainInstallRoot)\ToolchainInfo.plist"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1693,7 +1693,7 @@ function Build-Compilers() {`
`1693`	`1693`	`})`
`1694`	`1694`	`}`
`1695`	`1695`
`1696`		- Invoke-Program "$(Get-PythonExecutable)" -c "import plistlib; print(str(plistlib.dumps({ 'Identifier': '${ToolchainIdentifier}' }), encoding='utf-8'))" `
	`1696`	+ Invoke-Program "$(Get-PythonExecutable)" -c "import plistlib; print(str(plistlib.dumps({ 'Identifier': '${ToolchainIdentifier}', 'FallbackLibrarySearchPaths': ['usr/bin'], 'Version': '${ProductVersion}' }), encoding='utf-8'))" `
`1697`	`1697`	`-OutFile "$($Arch.ToolchainInstallRoot)\ToolchainInfo.plist"`
`1698`	`1698`	`}`
`1699`	`1699`