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

Fix review comments

Browse Source
This commit is contained in:
bjorn3 2023-10-22 19:25:16 +00:00
parent a58327dc01
commit add99438c8
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ci/run.sh
View File

@ -84,6 +84,8 @@ if [ "$DIST_SRC" = "" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-dist-src" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-dist-src"
fi fi
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift"
# Always set the release channel for bootstrap; this is normally not important (i.e., only dist # Always set the release channel for bootstrap; this is normally not important (i.e., only dist
# builds would seem to matter) but in practice bootstrap wants to know whether we're targeting # builds would seem to matter) but in practice bootstrap wants to know whether we're targeting
# master, beta, or stable with a build to determine whether to run some checks (notably toolstate). # master, beta, or stable with a build to determine whether to run some checks (notably toolstate).
@ -105,7 +107,6 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
fi fi
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift"
else else
# We almost always want debug assertions enabled, but sometimes this takes too # We almost always want debug assertions enabled, but sometimes this takes too
# long for too little benefit, so we just turn them off. # long for too little benefit, so we just turn them off.
@ -126,8 +127,6 @@ else
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift"
# We enable this for non-dist builders, since those aren't trying to produce # We enable this for non-dist builders, since those aren't trying to produce
# fresh binaries. We currently don't entirely support distributing a fresh # fresh binaries. We currently don't entirely support distributing a fresh
# copy of the compiler (including llvm tools, etc.) if we haven't actually # copy of the compiler (including llvm tools, etc.) if we haven't actually

1
src/tools/build-manifest/src/versions.rs
View File

@ -108,7 +108,6 @@ pub(crate) fn targets(&self) -> &[&str] {
ReproducibleArtifacts => HOSTS, ReproducibleArtifacts => HOSTS,
RustcDocs => HOSTS, RustcDocs => HOSTS,
Cargo => HOSTS, Cargo => HOSTS,
// FIXME should this use the exact list of targets for which we build cg_clif?
RustcCodegenCranelift => HOSTS, RustcCodegenCranelift => HOSTS,
RustMingw => MINGW, RustMingw => MINGW,
RustStd => TARGETS, RustStd => TARGETS,