Merge pull request #72711 from hjyamauchi/hiroshi/buildps1a

compnerd · web-flow · commit 365da5f0ff87 · 2024-03-31T03:36:12.000+09:00
Remove unnecessary /usr/include/CSystem directory to avoid build errors
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1536,6 +1536,11 @@ function Build-System($Arch) {
     -Defines @{
       BUILD_SHARED_LIBS = "YES";
     }
+
+  if (-not $ToBatch) {
+    # Remove unnecessary "S:\Program Files\swift\Toolchains\0.0.0+Asserts\usr\include\CSystem"
+    Remove-Item -Force -Recurse "$($Arch.ToolchainInstallRoot)\usr\include\CSystem" -ErrorAction Ignore | Out-Null
+  }
 }
 
 function Build-ToolsSupportCore($Arch) {

Original file line number	Diff line number	Diff line change
`@@ -1536,6 +1536,11 @@ function Build-System($Arch) {`
`1536`	`1536`	`-Defines @{`
`1537`	`1537`	`BUILD_SHARED_LIBS = "YES";`
`1538`	`1538`	`}`
	`1539`	`+`
	`1540`	`+ if (-not $ToBatch) {`
	`1541`	`+ # Remove unnecessary "S:\Program Files\swift\Toolchains\0.0.0+Asserts\usr\include\CSystem"`
	`1542`	`+ Remove-Item -Force -Recurse "$($Arch.ToolchainInstallRoot)\usr\include\CSystem" -ErrorAction Ignore \| Out-Null`
	`1543`	`+ }`
`1539`	`1544`	`}`
`1540`	`1545`
`1541`	`1546`	`function Build-ToolsSupportCore($Arch) {`