Skip to content

Commit a5df606

Browse files
committed
update config for windows-arm64 rust flags
1 parent 8b44994 commit a5df606

File tree

2 files changed

+40
-37
lines changed

2 files changed

+40
-37
lines changed

.cargo/config.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ registry-auth = true
66
powershell = { index = "sparse+https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/Cargo/index/" }
77

88
# Enable Control Flow Guard (needed for OneBranch's post-build analysis).
9-
[target.'cfg(target_os = "windows")']
9+
[target.x86_64-pc-windows-msvc]
1010
rustflags = ["-Ccontrol-flow-guard", "-Ctarget-feature=+crt-static", "-Clink-args=/DYNAMICBASE /CETCOMPAT"]
1111

12+
[target.aarch64-windows-msvc]
13+
rustflags = ["-Ccontrol-flow-guard", "-Ctarget-feature=+crt-static", "-Clink-args=/DYNAMICBASE"]
14+
1215
[target.aarch64-unknown-linux-gnu]
1316
linker = "aarch64-msft-linux-gcc"

.pipelines/DSC-Official.yml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ extends:
116116
displayName: 🛠️ Workaround for the LoadLibrary ACCESS_VIOLATION OneBranch issue
117117
env:
118118
ob_restore_phase: true
119-
# - task: RustInstaller@1
120-
# inputs:
121-
# rustVersion: ms-stable
122-
# toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
123-
# cratesIoFeedOverride: sparse+https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/Cargo/index/
124-
# additionalTargets: $(buildName)
125-
# displayName: Install Rust
126-
# env:
127-
# ob_restore_phase: true
119+
- task: RustInstaller@1
120+
inputs:
121+
rustVersion: ms-stable
122+
toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
123+
cratesIoFeedOverride: sparse+https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/Cargo/index/
124+
additionalTargets: $(buildName)
125+
displayName: Install Rust
126+
env:
127+
ob_restore_phase: true
128128
- task: AzureCLI@2
129129
inputs:
130130
azureSubscription: az-PowerShell-feed-ingestion
@@ -253,15 +253,15 @@ extends:
253253
pool:
254254
type: linux
255255
steps:
256-
# - task: RustInstaller@1
257-
# inputs:
258-
# rustVersion: ms-stable
259-
# toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
260-
# cratesIoFeedOverride: sparse+https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/Cargo/index/
261-
# additionalTargets: x86_64-unknown-linux-gnu
262-
# displayName: Install Rust
263-
# env:
264-
# ob_restore_phase: true
256+
- task: RustInstaller@1
257+
inputs:
258+
rustVersion: ms-stable
259+
toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
260+
cratesIoFeedOverride: sparse+https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/Cargo/index/
261+
additionalTargets: x86_64-unknown-linux-gnu
262+
displayName: Install Rust
263+
env:
264+
ob_restore_phase: true
265265
- task: AzureCLI@2
266266
inputs:
267267
azureSubscription: az-PowerShell-feed-ingestion
@@ -300,15 +300,15 @@ extends:
300300
type: linux
301301
hostArchitecture: arm64
302302
steps:
303-
# - task: RustInstaller@1
304-
# inputs:
305-
# rustVersion: ms-stable
306-
# toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
307-
# cratesIoFeedOverride: sparse+https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/Cargo/index/
308-
# additionalTargets: aarch64-unknown-linux-gnu
309-
# displayName: Install Rust
310-
# env:
311-
# ob_restore_phase: true
303+
- task: RustInstaller@1
304+
inputs:
305+
rustVersion: ms-stable
306+
toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
307+
cratesIoFeedOverride: sparse+https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/Cargo/index/
308+
additionalTargets: aarch64-unknown-linux-gnu
309+
displayName: Install Rust
310+
env:
311+
ob_restore_phase: true
312312
- task: AzureCLI@2
313313
inputs:
314314
azureSubscription: az-PowerShell-feed-ingestion
@@ -355,15 +355,15 @@ extends:
355355
macOS arm64:
356356
buildName: aarch64-apple-darwin
357357
steps:
358-
# - task: RustInstaller@1
359-
# inputs:
360-
# rustVersion: ms-stable
361-
# toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
362-
# cratesIoFeedOverride: sparse+https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/Cargo/index/
363-
# additionalTargets: $(buildName)
364-
# displayName: Install Rust
365-
# env:
366-
# ob_restore_phase: true
358+
- task: RustInstaller@1
359+
inputs:
360+
rustVersion: ms-stable
361+
toolchainFeed: https://pkgs.dev.azure.com/mscodehub/Rust/_packaging/Rust/nuget/v3/index.json
362+
cratesIoFeedOverride: sparse+https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/Cargo/index/
363+
additionalTargets: $(buildName)
364+
displayName: Install Rust
365+
env:
366+
ob_restore_phase: true
367367
- task: AzureCLI@2
368368
inputs:
369369
azureSubscription: az-PowerShell-feed-ingestion

0 commit comments

Comments
 (0)