File tree 3 files changed +3
-12
lines changed
3 files changed +3
-12
lines changed Original file line number Diff line number Diff line change @@ -1307,10 +1307,6 @@ impl Build {
1307
1307
self . package_vers ( & self . version )
1308
1308
}
1309
1309
1310
- fn llvm_link_tools_dynamically ( & self , target : TargetSelection ) -> bool {
1311
- target. contains ( "linux-gnu" ) || target. contains ( "apple-darwin" )
1312
- }
1313
-
1314
1310
/// Returns the `version` string associated with this compiler for Rust
1315
1311
/// itself.
1316
1312
///
Original file line number Diff line number Diff line change @@ -423,12 +423,7 @@ impl Step for Llvm {
423
423
// which saves both memory during parallel links and overall disk space
424
424
// for the tools. We don't do this on every platform as it doesn't work
425
425
// equally well everywhere.
426
- //
427
- // If we're not linking rustc to a dynamic LLVM, though, then don't link
428
- // tools to it.
429
- let llvm_link_shared =
430
- builder. llvm_link_tools_dynamically ( target) && builder. llvm_link_shared ( ) ;
431
- if llvm_link_shared {
426
+ if builder. llvm_link_shared ( ) {
432
427
cfg. define ( "LLVM_LINK_LLVM_DYLIB" , "ON" ) ;
433
428
}
434
429
@@ -553,7 +548,7 @@ impl Step for Llvm {
553
548
// libLLVM.dylib will be built. However, llvm-config will still look
554
549
// for a versioned path like libLLVM-14.dylib. Manually create a symbolic
555
550
// link to make llvm-config happy.
556
- if llvm_link_shared && target. contains ( "apple-darwin" ) {
551
+ if builder . llvm_link_shared ( ) && target. contains ( "apple-darwin" ) {
557
552
let mut cmd = Command :: new ( & build_llvm_config) ;
558
553
let version = output ( cmd. arg ( "--version" ) ) ;
559
554
let major = version. split ( '.' ) . next ( ) . unwrap ( ) ;
Original file line number Diff line number Diff line change @@ -286,7 +286,7 @@ jobs:
286
286
287
287
- name : x86_64-gnu-llvm-13
288
288
<< : *job-linux-xl
289
-
289
+
290
290
- name : x86_64-gnu-tools
291
291
env :
292
292
CI_ONLY_WHEN_SUBMODULES_CHANGED : 1
You can’t perform that action at this time.
0 commit comments