Skip to content

Commit 3a790d9

Browse files
bors[bot]DiXN
andauthored
Merge #303
303: Add support for "x86_64-pc-windows-msvc" on Azure Pipelines. r=reitermarkus a=DiXN Co-authored-by: Michael Kaltschmid <[email protected]>
2 parents 3fa5f1b + 2c90bc5 commit 3a790d9

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ strategy:
6666
thumbv7em-none-eabi: { TARGET: thumbv7em-none-eabi, STD: 1 }
6767
thumbv7em-none-eabihf: { TARGET: thumbv7em-none-eabihf, STD: 1 }
6868
thumbv7m-none-eabi: { TARGET: thumbv7m-none-eabi, STD: 1 }
69+
x86_64-pc-windows-msvc: { TARGET: x86_64-pc-windows-msvc, CPP: 1, STD: 1, RUN: 1, VM_IMAGE: vs2017-win2016, DEPLOY: 1 }
6970

7071
steps:
7172
- template: ci/azure-install-rust.yml

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl Host {
6262
} else if *self == Host::X86_64UnknownLinuxGnu {
6363
target.map(|t| t.needs_docker()).unwrap_or(true)
6464
} else if *self == Host::X86_64PcWindowsMsvc {
65-
target.map(|t| t.needs_docker()).unwrap_or(false)
65+
target.map(|t| t.triple() != Host::X86_64PcWindowsMsvc.triple() && t.needs_docker()).unwrap_or(false)
6666
} else {
6767
false
6868
}

0 commit comments

Comments
 (0)