Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/debuggers/cdb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub(crate) fn discover_cdb(target: TargetSelection) -> Option<Cdb> {
let cdb_arch = if cfg!(target_arch = "x86") {
"x86"
} else if cfg!(target_arch = "x86_64") {
"x64"
if target.starts_with("i686") { "x86" } else { "x64" }
} else if cfg!(target_arch = "aarch64") {
"arm64"
} else if cfg!(target_arch = "arm") {
Expand Down
7 changes: 3 additions & 4 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -616,13 +616,13 @@ auto:
# i686-msvc is split into two jobs to run tests in parallel.
- name: i686-msvc-1
env:
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --target=i686-pc-windows-msvc --enable-sanitizers
SCRIPT: make ci-msvc-py
<<: *job-windows

- name: i686-msvc-2
env:
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --target=i686-pc-windows-msvc --enable-sanitizers
SCRIPT: make ci-msvc-ps1
<<: *job-windows

Expand Down Expand Up @@ -717,8 +717,7 @@ auto:
- name: dist-i686-msvc
env:
RUST_CONFIGURE_ARGS: >-
--build=i686-pc-windows-msvc
--host=i686-pc-windows-msvc
--build=x86_64-pc-windows-msvc
--target=i686-pc-windows-msvc
--enable-full-tools
--enable-profiler
Expand Down
Loading