Merge pull request #1063 from SteveL-MSFT/v3.2-p4-merge

SteveL-MSFT · web-flow · commit 1c863657df4a · 2025-09-04T10:53:32.000-07:00
Sync changes for release pipeline
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -18,9 +18,3 @@ rustflags = ["-Ccontrol-flow-guard", "-Ctarget-feature=+crt-static", "-Clink-arg
 # The following is only needed for release builds
 [source.crates-io]
 replace-with = "POWERSHELL"
-
-#[target.aarch64-unknown-linux-gnu]
-#linker = "aarch64-linux-gnu-gcc"
-
-#[target.aarch64-unknown-linux-musl]
-#linker = "aarch64-linux-musl-gcc"
diff --git a/build.ps1 b/build.ps1
@@ -167,8 +167,6 @@ if ($null -ne (Get-Command msrustup -CommandType Application -ErrorAction Ignore
     }
 } elseif ($null -ne (Get-Command rustup -CommandType Application -ErrorAction Ignore)) {
         $rustup = 'rustup'
-} else {
-    $rustup = 'echo'
 }
 
 if ($null -ne $packageType) {

Original file line number	Diff line number	Diff line change
`@@ -167,8 +167,6 @@ if ($null -ne (Get-Command msrustup -CommandType Application -ErrorAction Ignore`
`167`	`167`	`}`
`168`	`168`	`} elseif ($null -ne (Get-Command rustup -CommandType Application -ErrorAction Ignore)) {`
`169`	`169`	`$rustup = 'rustup'`
`170`		`-} else {`
`171`		`- $rustup = 'echo'`
`172`	`170`	`}`
`173`	`171`
`174`	`172`	`if ($null -ne $packageType) {`