File tree Expand file tree Collapse file tree 1 file changed +8
-0
lines changed
src/bootstrap/src/utils/tests Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ use tempfile::TempDir;
7
7
8
8
use crate :: core:: builder:: Builder ;
9
9
use crate :: core:: config:: DryRun ;
10
+ use crate :: utils:: helpers:: get_host_target;
10
11
use crate :: { Build , Config , Flags , t} ;
11
12
12
13
pub mod git;
@@ -91,6 +92,13 @@ impl ConfigBuilder {
91
92
self . args . push ( "--set" . to_string ( ) ) ;
92
93
self . args . push ( "build.submodules=false" . to_string ( ) ) ;
93
94
95
+ // Override any external LLVM set and inhibit CI LLVM; pretend that we're always building
96
+ // in-tree LLVM from sources.
97
+ self . args . push ( "--set" . to_string ( ) ) ;
98
+ self . args . push ( "llvm.download-ci-llvm=false" . to_string ( ) ) ;
99
+ self . args . push ( "--set" . to_string ( ) ) ;
100
+ self . args . push ( format ! ( "target.'{}'.llvm-config=false" , get_host_target( ) ) ) ;
101
+
94
102
// Do not mess with the local rustc checkout build directory
95
103
self . args . push ( "--build-dir" . to_string ( ) ) ;
96
104
self . args . push ( self . directory . join ( "build" ) . display ( ) . to_string ( ) ) ;
You can’t perform that action at this time.
0 commit comments