File tree Expand file tree Collapse file tree 3 files changed +5
-3
lines changed
src/bootstrap/src/core/config Expand file tree Collapse file tree 3 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -798,6 +798,7 @@ impl Config {
798
798
config. apply_install_config ( toml. install ) ;
799
799
config. apply_gcc_config ( toml. gcc ) ;
800
800
config. apply_dist_config ( toml. dist ) ;
801
+ config. apply_llvm_config ( toml. llvm ) ;
801
802
802
803
config. apply_build_config (
803
804
toml. build ,
@@ -809,7 +810,9 @@ impl Config {
809
810
) ;
810
811
config. apply_target_config ( toml. target ) ;
811
812
config. apply_rust_config ( toml. rust , flags_warnings) ;
812
- config. apply_llvm_config ( toml. llvm ) ;
813
+
814
+ config. llvm_enzyme =
815
+ config. llvm_enzyme || config. channel == "dev" || config. channel == "nightly" ;
813
816
814
817
if config. llvm_from_ci {
815
818
let triple = & config. host_target . triple ;
Original file line number Diff line number Diff line change @@ -206,7 +206,7 @@ impl Config {
206
206
self . llvm_allow_old_toolchain = allow_old_toolchain. unwrap_or ( false ) ;
207
207
self . llvm_offload = offload. unwrap_or ( false ) ;
208
208
self . llvm_tests = tests. unwrap_or ( false ) ;
209
- self . llvm_enzyme = enzyme. unwrap_or ( false ) ;
209
+ self . llvm_enzyme = enzyme. unwrap_or ( self . channel == "dev" || self . channel == "nightly" ) ;
210
210
self . llvm_plugins = plugins. unwrap_or ( false ) ;
211
211
self . llvm_polly = polly. unwrap_or ( false ) ;
212
212
self . llvm_clang = clang. unwrap_or ( false ) ;
Original file line number Diff line number Diff line change @@ -619,7 +619,6 @@ impl Config {
619
619
self . rust_randomize_layout = randomize_layout. unwrap_or_default ( ) ;
620
620
self . llvm_tools_enabled = llvm_tools. unwrap_or ( true ) ;
621
621
622
- self . llvm_enzyme = self . channel == "dev" || self . channel == "nightly" ;
623
622
self . rustc_default_linker = default_linker;
624
623
self . musl_root = musl_root. map ( PathBuf :: from) ;
625
624
self . save_toolstates = save_toolstates. map ( PathBuf :: from) ;
You can’t perform that action at this time.
0 commit comments