Skip to content

Commit 072547a

Browse files
committed
Build and test cg_clif by default except for distros
1 parent b9cdd1d commit 072547a

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

config.example.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ changelog-seen = 2
618618
# and currently the only standard options supported are `"llvm"`, `"cranelift"`
619619
# and `"gcc"`. The first backend in this list will be used as default by rustc
620620
# when no explicit backend is specified.
621-
#codegen-backends = ["llvm"]
621+
#codegen-backends = ["llvm", "cranelift"]
622622

623623
# Indicates whether LLD will be compiled and made available in the sysroot for
624624
# rustc to execute.

src/bootstrap/config.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,8 @@ impl Config {
10651065
config.channel = "dev".to_string();
10661066
config.codegen_tests = true;
10671067
config.rust_dist_src = true;
1068-
config.rust_codegen_backends = vec![INTERNER.intern_str("llvm")];
1068+
config.rust_codegen_backends =
1069+
vec![INTERNER.intern_str("llvm"), INTERNER.intern_str("cranelift")];
10691070
config.deny_warnings = true;
10701071
config.bindir = "bin".into();
10711072
config.dist_include_mingw_linker = true;

src/bootstrap/defaults/config.dist.toml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ download-ci-llvm = false
1616
# Make sure they don't get set when installing from source.
1717
channel = "nightly"
1818
download-rustc = false
19+
# Skip building the cranelift backend. It isn't ready to be shipped yet.
20+
codegen-backends = ["llvm"]
1921

2022
[dist]
2123
# Use better compression when preparing tarballs.

0 commit comments

Comments
 (0)