Auto merge of #128939 - bjorn3:windows_cg_clif_component, r=albertlar… · rust-lang/rust@d7522d8 (original) (raw)
File tree
3 files changed
lines changed
- compiler/rustc_codegen_cranelift
- bootstrap/src/core/build_steps
3 files changed
lines changed
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -70,7 +70,7 @@ For more docs on how to build and test see [build_system/usage.txt](build_system | ||
| 70 | 70 | |AIX |
| 71 | 71 | |Other unixes |
| 72 | 72 | |macOS |
| 73 | -|Windows | |
| 73 | +|Windows | |
| 74 | 74 | |
| 75 | 75 | ✅: Fully supported and tested |
| 76 | 76 | ❓: Maybe supported, not tested |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1348,18 +1348,9 @@ impl Step for CodegenBackend { | ||
| 1348 | 1348 | return None; |
| 1349 | 1349 | } |
| 1350 | 1350 | |
| 1351 | -if self.backend == "cranelift" { | |
| 1352 | -if !target_supports_cranelift_backend(self.compiler.host) { | |
| 1353 | - builder.info("target not supported by rustc_codegen_cranelift. skipping"); | |
| 1354 | -return None; | |
| 1355 | -} | |
| 1356 | - | |
| 1357 | -if self.compiler.host.is_windows() { | |
| 1358 | - builder.info( | |
| 1359 | -"dist currently disabled for windows by rustc_codegen_cranelift. skipping", | |
| 1360 | -); | |
| 1361 | -return None; | |
| 1362 | -} | |
| 1351 | +if self.backend == "cranelift" && !target_supports_cranelift_backend(self.compiler.host) { | |
| 1352 | + builder.info("target not supported by rustc_codegen_cranelift. skipping"); | |
| 1353 | +return None; | |
| 1363 | 1354 | } |
| 1364 | 1355 | |
| 1365 | 1356 | let compiler = self.compiler; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -430,6 +430,7 @@ auto: | ||
| 430 | 430 | --set rust.codegen-units=1 |
| 431 | 431 | 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 |
| 432 | 432 | DIST_REQUIRE_ALL_TOOLS: 1 |
| 433 | +CODEGEN_BACKENDS: llvm,cranelift | |
| 433 | 434 | <<: *job-windows-8c |
| 434 | 435 | |
| 435 | 436 | - image: dist-i686-msvc |
| @@ -442,6 +443,7 @@ auto: | ||
| 442 | 443 | --enable-profiler |
| 443 | 444 | SCRIPT: python x.py dist bootstrap --include-default-paths |
| 444 | 445 | DIST_REQUIRE_ALL_TOOLS: 1 |
| 446 | +CODEGEN_BACKENDS: llvm,cranelift | |
| 445 | 447 | <<: *job-windows-8c |
| 446 | 448 | |
| 447 | 449 | - image: dist-aarch64-msvc |
| @@ -466,6 +468,7 @@ auto: | ||
| 466 | 468 | NO_DOWNLOAD_CI_LLVM: 1 |
| 467 | 469 | SCRIPT: python x.py dist bootstrap --include-default-paths |
| 468 | 470 | DIST_REQUIRE_ALL_TOOLS: 1 |
| 471 | +CODEGEN_BACKENDS: llvm,cranelift | |
| 469 | 472 | <<: *job-windows-8c |
| 470 | 473 | |
| 471 | 474 | - image: dist-x86_64-mingw |
| @@ -478,6 +481,7 @@ auto: | ||
| 478 | 481 | # incompatible with LLVM downloads today). |
| 479 | 482 | NO_DOWNLOAD_CI_LLVM: 1 |
| 480 | 483 | DIST_REQUIRE_ALL_TOOLS: 1 |
| 484 | +CODEGEN_BACKENDS: llvm,cranelift | |
| 481 | 485 | <<: *job-windows-8c |
| 482 | 486 | |
| 483 | 487 | - image: dist-x86_64-msvc-alt |