From f447d74bf7e8a377744255031ec86471ec756fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Thu, 9 Jul 2026 17:27:25 +0200 Subject: [PATCH 1/2] i686-msvc: drop host tools --- src/ci/github-actions/jobs.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index a8eebe7599fda..944351794dd58 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -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 @@ -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 From aeb892b63ce81dfcca24b4820899e1d0aa48c0a3 Mon Sep 17 00:00:00 2001 From: George Tokmaji Date: Thu, 9 Jul 2026 20:25:14 +0200 Subject: [PATCH 2/2] Try using x86 cdb --- src/bootstrap/src/core/debuggers/cdb.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/src/core/debuggers/cdb.rs b/src/bootstrap/src/core/debuggers/cdb.rs index 7f835f3618724..11963a9a1a7c9 100644 --- a/src/bootstrap/src/core/debuggers/cdb.rs +++ b/src/bootstrap/src/core/debuggers/cdb.rs @@ -16,7 +16,7 @@ pub(crate) fn discover_cdb(target: TargetSelection) -> Option { 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") {