Skip to content

Commit 8a8896d

Browse files
committed
[WIP] Distribute rustc_codegen_cranelift for Windows
1 parent 04ba50e commit 8a8896d

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/bootstrap/src/core/build_steps/dist.rs

-7
Original file line numberDiff line numberDiff line change
@@ -1366,13 +1366,6 @@ impl Step for CodegenBackend {
13661366
builder.info("target not supported by rustc_codegen_cranelift. skipping");
13671367
return None;
13681368
}
1369-
1370-
if self.compiler.host.is_windows() {
1371-
builder.info(
1372-
"dist currently disabled for windows by rustc_codegen_cranelift. skipping",
1373-
);
1374-
return None;
1375-
}
13761369
}
13771370

13781371
let compiler = self.compiler;

src/ci/github-actions/jobs.yml

+4
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ auto:
416416
--set rust.codegen-units=1
417417
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
418418
DIST_REQUIRE_ALL_TOOLS: 1
419+
CODEGEN_BACKENDS: llvm,cranelift
419420
<<: *job-windows-8c
420421

421422
- image: dist-i686-msvc
@@ -428,6 +429,7 @@ auto:
428429
--enable-profiler
429430
SCRIPT: python x.py dist bootstrap --include-default-paths
430431
DIST_REQUIRE_ALL_TOOLS: 1
432+
CODEGEN_BACKENDS: llvm,cranelift
431433
<<: *job-windows-8c
432434

433435
- image: dist-aarch64-msvc
@@ -452,6 +454,7 @@ auto:
452454
NO_DOWNLOAD_CI_LLVM: 1
453455
SCRIPT: python x.py dist bootstrap --include-default-paths
454456
DIST_REQUIRE_ALL_TOOLS: 1
457+
CODEGEN_BACKENDS: llvm,cranelift
455458
<<: *job-windows-8c
456459

457460
- image: dist-x86_64-mingw
@@ -464,6 +467,7 @@ auto:
464467
# incompatible with LLVM downloads today).
465468
NO_DOWNLOAD_CI_LLVM: 1
466469
DIST_REQUIRE_ALL_TOOLS: 1
470+
CODEGEN_BACKENDS: llvm,cranelift
467471
<<: *job-windows-8c
468472

469473
- image: dist-x86_64-msvc-alt

0 commit comments

Comments
 (0)