Flesh out Windows ToolchainInfo.plist

owenv · owenv · commit cd3e57aa3e7f · 2025-02-17T13:04:08.000-08:00
- Add FallbackLibraryPaths to usr/bin - swift-build uses this to lookup dlls like libclang
- Fill in the version field used to construct runtime library paths
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1709,7 +1709,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
`@@ -1709,7 +1709,7 @@ function Build-Compilers() {`
`1709`	`1709`	`})`
`1710`	`1710`	`}`
`1711`	`1711`
`1712`		- Invoke-Program "$(Get-PythonExecutable)" -c "import plistlib; print(str(plistlib.dumps({ 'Identifier': '${ToolchainIdentifier}' }), encoding='utf-8'))" `
	`1712`	+ Invoke-Program "$(Get-PythonExecutable)" -c "import plistlib; print(str(plistlib.dumps({ 'Identifier': '${ToolchainIdentifier}', 'FallbackLibrarySearchPaths': ['usr/bin'], 'Version': '${ProductVersion}' }), encoding='utf-8'))" `
`1713`	`1713`	`-OutFile "$($Arch.ToolchainInstallRoot)\ToolchainInfo.plist"`
`1714`	`1714`	`}`
`1715`	`1715`