File tree 2 files changed +5
-1
lines changed
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 {
155
155
156
156
// When using `download-rustc`, we already have artifacts for the host available. Don't
157
157
// recompile them.
158
- if builder. download_rustc ( ) && builder. config . is_builder_target ( target)
158
+ if builder. download_rustc ( ) && builder. config . is_host_target ( target)
159
159
// NOTE: the beta compiler may generate different artifacts than the downloaded compiler, so
160
160
// its artifacts can't be reused.
161
161
&& compiler. stage != 0
Original file line number Diff line number Diff line change @@ -2397,6 +2397,10 @@ impl Config {
2397
2397
) ;
2398
2398
}
2399
2399
2400
+ if config. lld_enabled && config. is_system_llvm ( config. build ) {
2401
+ panic ! ( "Cannot enable LLD when using external llvm-config." ) ;
2402
+ }
2403
+
2400
2404
let default_std_features = BTreeSet :: from ( [ String :: from ( "panic-unwind" ) ] ) ;
2401
2405
config. rust_std_features = std_features. unwrap_or ( default_std_features) ;
2402
2406
You can’t perform that action at this time.
0 commit comments