@@ -612,6 +612,37 @@ impl Config {
612
612
std_features : rust_std_features_toml,
613
613
} = toml. rust . unwrap_or_default ( ) ;
614
614
615
+ let Llvm {
616
+ optimize : llvm_optimize_toml,
617
+ thin_lto : llvm_thin_lto_toml,
618
+ release_debuginfo : llvm_release_debuginfo_toml,
619
+ assertions : llvm_assertions_toml,
620
+ tests : llvm_tests_toml,
621
+ enzyme : llvm_enzyme_toml,
622
+ plugins : llvm_plugin_toml,
623
+ static_libstdcpp : llvm_static_libstdcpp_toml,
624
+ libzstd : llvm_libzstd_toml,
625
+ ninja : llvm_ninja_toml,
626
+ targets : llvm_targets_toml,
627
+ experimental_targets : llvm_experimental_targets_toml,
628
+ link_jobs : llvm_link_jobs_toml,
629
+ link_shared : llvm_link_shared_toml,
630
+ version_suffix : llvm_version_suffix_toml,
631
+ clang_cl : llvm_clang_cl_toml,
632
+ cflags : llvm_cflags_toml,
633
+ cxxflags : llvm_cxxflags_toml,
634
+ ldflags : llvm_ldflags_toml,
635
+ use_libcxx : llvm_use_libcxx_toml,
636
+ use_linker : llvm_use_linker_toml,
637
+ allow_old_toolchain : llvm_allow_old_toolchain_toml,
638
+ offload : llvm_offload_toml,
639
+ polly : llvm_polly_toml,
640
+ clang : llvm_clang_toml,
641
+ enable_warnings : llvm_enable_warnings_toml,
642
+ download_ci_llvm : llvm_download_ci_llvm_toml,
643
+ build_config : llvm_build_config_toml,
644
+ } = toml. llvm . unwrap_or_default ( ) ;
645
+
615
646
if cfg ! ( test) {
616
647
// When configuring bootstrap for tests, make sure to set the rustc and Cargo to the
617
648
// same ones used to call the tests (if custom ones are not defined in the toml). If we
@@ -839,6 +870,11 @@ impl Config {
839
870
config. libdir = install_libdir;
840
871
config. mandir = install_mandir;
841
872
873
+ <<<<<<< HEAD
874
+ =======
875
+ config. llvm_assertions = llvm_assertions_toml. unwrap_or( false ) ;
876
+
877
+ >>>>>>> f1dbcb5ad2c ( move llvm config to the top of parse method)
842
878
let file_content = t ! ( fs:: read_to_string( config. src. join( "src/ci/channel" ) ) ) ;
843
879
let ci_channel = file_content. trim_end( ) ;
844
880
@@ -1130,37 +1166,6 @@ impl Config {
1130
1166
config. channel = channel;
1131
1167
}
1132
1168
1133
- let Llvm {
1134
- optimize : llvm_optimize_toml,
1135
- thin_lto : llvm_thin_lto_toml,
1136
- release_debuginfo : llvm_release_debuginfo_toml,
1137
- assertions : _,
1138
- tests : llvm_tests_toml,
1139
- enzyme : llvm_enzyme_toml,
1140
- plugins : llvm_plugin_toml,
1141
- static_libstdcpp : llvm_static_libstdcpp_toml,
1142
- libzstd : llvm_libzstd_toml,
1143
- ninja : llvm_ninja_toml,
1144
- targets : llvm_targets_toml,
1145
- experimental_targets : llvm_experimental_targets_toml,
1146
- link_jobs : llvm_link_jobs_toml,
1147
- link_shared : llvm_link_shared_toml,
1148
- version_suffix : llvm_version_suffix_toml,
1149
- clang_cl : llvm_clang_cl_toml,
1150
- cflags : llvm_cflags_toml,
1151
- cxxflags : llvm_cxxflags_toml,
1152
- ldflags : llvm_ldflags_toml,
1153
- use_libcxx : llvm_use_libcxx_toml,
1154
- use_linker : llvm_use_linker_toml,
1155
- allow_old_toolchain : llvm_allow_old_toolchain_toml,
1156
- offload : llvm_offload_toml,
1157
- polly : llvm_polly_toml,
1158
- clang : llvm_clang_toml,
1159
- enable_warnings : llvm_enable_warnings_toml,
1160
- download_ci_llvm : llvm_download_ci_llvm_toml,
1161
- build_config : llvm_build_config_toml,
1162
- } = toml. llvm . unwrap_or_default ( ) ;
1163
-
1164
1169
set ( & mut config. ninja_in_file , llvm_ninja_toml) ;
1165
1170
set ( & mut config. llvm_optimize , llvm_optimize_toml) ;
1166
1171
set ( & mut config. llvm_thin_lto , llvm_thin_lto_toml) ;
0 commit comments