diff options
| author | bors <bors@rust-lang.org> | 2024-09-09 16:09:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-09 16:09:06 +0000 |
| commit | d7522d872601c5243899a813728a05cde1e5a8e2 (patch) | |
| tree | 0bf2bed29554a8543fb3ac3fbd3c898f5a1a0d0d | |
| parent | 38e3a5771cefc9362976a605549f8b04d5707311 (diff) | |
| parent | 2dbc976f5d1e49343cba31c0b3a529c2f4d3d271 (diff) | |
| download | rust-d7522d872601c5243899a813728a05cde1e5a8e2.tar.gz rust-d7522d872601c5243899a813728a05cde1e5a8e2.zip | |
Auto merge of #128939 - bjorn3:windows_cg_clif_component, r=albertlarsan68
Distribute rustc_codegen_cranelift for Windows With support for raw-dylib recently added to cg_clif, and inline assembly support working on Windows for quite a while now, all blockers for distributing cg_clif on Windows that I mentioned in https://github.com/rust-lang/rust/pull/81746#issuecomment-1774099637 are fixed now.
| -rw-r--r-- | compiler/rustc_codegen_cranelift/Readme.md | 2 | ||||
| -rw-r--r-- | src/bootstrap/src/core/build_steps/dist.rs | 15 | ||||
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 4 |
3 files changed, 8 insertions, 13 deletions
diff --git a/compiler/rustc_codegen_cranelift/Readme.md b/compiler/rustc_codegen_cranelift/Readme.md index 6766e2f844d..18a840f8a50 100644 --- a/compiler/rustc_codegen_cranelift/Readme.md +++ b/compiler/rustc_codegen_cranelift/Readme.md @@ -70,7 +70,7 @@ For more docs on how to build and test see [build_system/usage.txt](build_system |AIX|❌[^xcoff]|N/A|N/A|❌[^xcoff]| |Other unixes|❓|❓|❓|❓| |macOS|✅|✅|N/A|N/A| -|Windows|✅[^no-rustup]|❌|N/A|N/A| +|Windows|✅|❌|N/A|N/A| ✅: Fully supported and tested ❓: Maybe supported, not tested diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index ccb5656d671..b0bd18792be 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -1348,18 +1348,9 @@ impl Step for CodegenBackend { return None; } - if self.backend == "cranelift" { - if !target_supports_cranelift_backend(self.compiler.host) { - builder.info("target not supported by rustc_codegen_cranelift. skipping"); - return None; - } - - if self.compiler.host.is_windows() { - builder.info( - "dist currently disabled for windows by rustc_codegen_cranelift. skipping", - ); - return None; - } + if self.backend == "cranelift" && !target_supports_cranelift_backend(self.compiler.host) { + builder.info("target not supported by rustc_codegen_cranelift. skipping"); + return None; } let compiler = self.compiler; diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index e237e98b7b7..41d3b311749 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -430,6 +430,7 @@ auto: --set rust.codegen-units=1 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 DIST_REQUIRE_ALL_TOOLS: 1 + CODEGEN_BACKENDS: llvm,cranelift <<: *job-windows-8c - image: dist-i686-msvc @@ -442,6 +443,7 @@ auto: --enable-profiler SCRIPT: python x.py dist bootstrap --include-default-paths DIST_REQUIRE_ALL_TOOLS: 1 + CODEGEN_BACKENDS: llvm,cranelift <<: *job-windows-8c - image: dist-aarch64-msvc @@ -466,6 +468,7 @@ auto: NO_DOWNLOAD_CI_LLVM: 1 SCRIPT: python x.py dist bootstrap --include-default-paths DIST_REQUIRE_ALL_TOOLS: 1 + CODEGEN_BACKENDS: llvm,cranelift <<: *job-windows-8c - image: dist-x86_64-mingw @@ -478,6 +481,7 @@ auto: # incompatible with LLVM downloads today). NO_DOWNLOAD_CI_LLVM: 1 DIST_REQUIRE_ALL_TOOLS: 1 + CODEGEN_BACKENDS: llvm,cranelift <<: *job-windows-8c - image: dist-x86_64-msvc-alt |