File tree Expand file tree Collapse file tree 2 files changed +5
-2
lines changed
src/bootstrap/src/core/config Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -795,9 +795,14 @@ impl Config {
795
795
. collect :: < Vec < PathBuf > > ( ) ,
796
796
) ;
797
797
798
+ // Though we are applying it here, but the enzyme from llvm should get preference.
799
+ config. llvm_enzyme =
800
+ config. llvm_enzyme || config. channel == "dev" || config. channel == "nightly" ;
801
+
798
802
config. apply_install_config ( toml. install ) ;
799
803
config. apply_gcc_config ( toml. gcc ) ;
800
804
config. apply_dist_config ( toml. dist ) ;
805
+ config. apply_llvm_config ( toml. llvm ) ;
801
806
802
807
config. apply_build_config (
803
808
toml. build ,
@@ -809,7 +814,6 @@ impl Config {
809
814
) ;
810
815
config. apply_target_config ( toml. target ) ;
811
816
config. apply_rust_config ( toml. rust , flags_warnings) ;
812
- config. apply_llvm_config ( toml. llvm ) ;
813
817
814
818
if config. llvm_from_ci {
815
819
let triple = & config. host_target . triple ;
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