File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -155,7 +155,7 @@ impl Step for Std {
155155
156156 // When using `download-rustc`, we already have artifacts for the host available. Don't
157157 // recompile them.
158- if builder. download_rustc ( ) && builder. config . is_builder_target ( target)
158+ if builder. download_rustc ( ) && builder. config . is_host_target ( target)
159159 // NOTE: the beta compiler may generate different artifacts than the downloaded compiler, so
160160 // its artifacts can't be reused.
161161 && compiler. stage != 0
Original file line number Diff line number Diff line change @@ -2397,6 +2397,10 @@ impl Config {
23972397 ) ;
23982398 }
23992399
2400+ if config. lld_enabled && config. is_system_llvm ( config. build ) {
2401+ panic ! ( "Cannot enable LLD when using external llvm-config." ) ;
2402+ }
2403+
24002404 let default_std_features = BTreeSet :: from ( [ String :: from ( "panic-unwind" ) ] ) ;
24012405 config. rust_std_features = std_features. unwrap_or ( default_std_features) ;
24022406
You can’t perform that action at this time.
0 commit comments