mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Distribute rustc_codegen_cranelift for Windows

Browse Source
This commit is contained in:
bjorn3 2024-08-10 19:23:03 +00:00
parent 04ba50e823
commit 2dbc976f5d
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_codegen_cranelift/Readme.md
View File

@ -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]| |AIX|❌[^xcoff]|N/A|N/A|❌[^xcoff]|
|Other unixes|❓|❓|❓|❓| |Other unixes|❓|❓|❓|❓|
|macOS|✅|✅|N/A|N/A| |macOS|✅|✅|N/A|N/A|
|Windows|✅[^no-rustup]|❌|N/A|N/A| |Windows|✅|❌|N/A|N/A|
✅: Fully supported and tested ✅: Fully supported and tested
❓: Maybe supported, not tested ❓: Maybe supported, not tested

15
src/bootstrap/src/core/build_steps/dist.rs
View File

@ -1361,18 +1361,9 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
return None; return None;
} }
if self.backend == "cranelift" { if self.backend == "cranelift" && !target_supports_cranelift_backend(self.compiler.host) {
if !target_supports_cranelift_backend(self.compiler.host) { builder.info("target not supported by rustc_codegen_cranelift. skipping");
builder.info("target not supported by rustc_codegen_cranelift. skipping"); return None;
return None;
}
if self.compiler.host.is_windows() {
builder.info(
"dist currently disabled for windows by rustc_codegen_cranelift. skipping",
);
return None;
}
} }
let compiler = self.compiler; let compiler = self.compiler;

4
src/ci/github-actions/jobs.yml
View File

@ -416,6 +416,7 @@ auto:
--set rust.codegen-units=1 --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 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 DIST_REQUIRE_ALL_TOOLS: 1
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-windows-8c <<: *job-windows-8c
- image: dist-i686-msvc - image: dist-i686-msvc
@ -428,6 +429,7 @@ auto:
--enable-profiler --enable-profiler
SCRIPT: python x.py dist bootstrap --include-default-paths SCRIPT: python x.py dist bootstrap --include-default-paths
DIST_REQUIRE_ALL_TOOLS: 1 DIST_REQUIRE_ALL_TOOLS: 1
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-windows-8c <<: *job-windows-8c
- image: dist-aarch64-msvc - image: dist-aarch64-msvc
@ -452,6 +454,7 @@ auto:
NO_DOWNLOAD_CI_LLVM: 1 NO_DOWNLOAD_CI_LLVM: 1
SCRIPT: python x.py dist bootstrap --include-default-paths SCRIPT: python x.py dist bootstrap --include-default-paths
DIST_REQUIRE_ALL_TOOLS: 1 DIST_REQUIRE_ALL_TOOLS: 1
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-windows-8c <<: *job-windows-8c
- image: dist-x86_64-mingw - image: dist-x86_64-mingw
@ -464,6 +467,7 @@ auto:
# incompatible with LLVM downloads today). # incompatible with LLVM downloads today).
NO_DOWNLOAD_CI_LLVM: 1 NO_DOWNLOAD_CI_LLVM: 1
DIST_REQUIRE_ALL_TOOLS: 1 DIST_REQUIRE_ALL_TOOLS: 1
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-windows-8c <<: *job-windows-8c
- image: dist-x86_64-msvc-alt - image: dist-x86_64-msvc-alt