diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-22 19:25:16 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-27 11:56:39 +0000 |
| commit | add99438c81bb6cba8b7052357e0bffffc7a0a35 (patch) | |
| tree | 5f95f3abc4e70f36d55d20c15bd8420db4878f26 | |
| parent | a58327dc014dabac8d69b9602011fee75d201815 (diff) | |
| download | rust-add99438c81bb6cba8b7052357e0bffffc7a0a35.tar.gz rust-add99438c81bb6cba8b7052357e0bffffc7a0a35.zip | |
Fix review comments
| -rwxr-xr-x | src/ci/run.sh | 5 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/versions.rs | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh index 17ce7a807b6..bcfe1fc0410 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -84,6 +84,8 @@ if [ "$DIST_SRC" = "" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-dist-src" 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 # 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). @@ -105,7 +107,6 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir" fi - RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift" else # We almost always want debug assertions enabled, but sometimes this takes too # 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.codegen-backends=llvm,cranelift" - # 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 # copy of the compiler (including llvm tools, etc.) if we haven't actually diff --git a/src/tools/build-manifest/src/versions.rs b/src/tools/build-manifest/src/versions.rs index 57f94bdd90a..e4cdf965eb6 100644 --- a/src/tools/build-manifest/src/versions.rs +++ b/src/tools/build-manifest/src/versions.rs @@ -108,7 +108,6 @@ impl PkgType { ReproducibleArtifacts => HOSTS, RustcDocs => HOSTS, Cargo => HOSTS, - // FIXME should this use the exact list of targets for which we build cg_clif? RustcCodegenCranelift => HOSTS, RustMingw => MINGW, RustStd => TARGETS, |