File tree Expand file tree Collapse file tree 3 files changed +29
-3
lines changed
ci/docker/host-x86_64/dist-x86_64-linux Expand file tree Collapse file tree 3 files changed +29
-3
lines changed Original file line number Diff line number Diff line change @@ -10,4 +10,7 @@ python3 ../x.py build --set rust.debug=true opt-dist
10
10
build-manifest bootstrap
11
11
12
12
# Use GCC for building GCC, as it seems to behave badly when built with Clang
13
- CC=/rustroot/bin/cc CXX=/rustroot/bin/c++ python3 ../x.py dist gcc
13
+ # Only build GCC on full builds, not try builds
14
+ if [ " ${DIST_TRY_BUILD:- 0} " == " 0" ]; then
15
+ CC=/rustroot/bin/cc CXX=/rustroot/bin/c++ python3 ../x.py dist gcc
16
+ fi
Original file line number Diff line number Diff line change @@ -122,7 +122,12 @@ impl Bootstrap {
122
122
let metrics_path = env. build_root ( ) . join ( "build" ) . join ( "metrics.json" ) ;
123
123
let args = dist_args. iter ( ) . map ( |arg| arg. as_str ( ) ) . collect :: < Vec < _ > > ( ) ;
124
124
let cmd = cmd ( & args) . env ( "RUST_BACKTRACE" , "full" ) ;
125
- let cmd = add_shared_x_flags ( env, cmd) ;
125
+ let mut cmd = add_shared_x_flags ( env, cmd) ;
126
+ if env. is_fast_try_build ( ) {
127
+ // We set build.extended=false for fast try builds, but we still need Cargo
128
+ cmd = cmd. arg ( "cargo" ) ;
129
+ }
130
+
126
131
Self { cmd, metrics_path }
127
132
}
128
133
@@ -189,5 +194,18 @@ impl Bootstrap {
189
194
}
190
195
191
196
fn add_shared_x_flags ( env : & Environment , cmd : CmdBuilder ) -> CmdBuilder {
192
- if env. is_fast_try_build ( ) { cmd. arg ( "--set" ) . arg ( "rust.deny-warnings=false" ) } else { cmd }
197
+ if env. is_fast_try_build ( ) {
198
+ // Skip things that cannot be skipped through `x ... --skip`
199
+ cmd. arg ( "--set" )
200
+ . arg ( "rust.llvm-bitcode-linker=false" )
201
+ // Skip wasm-component-ld. This also skips cargo, which we need to re-enable for dist
202
+ . arg ( "--set" )
203
+ . arg ( "build.extended=false" )
204
+ . arg ( "--set" )
205
+ . arg ( "rust.codegen-backends=['llvm']" )
206
+ . arg ( "--set" )
207
+ . arg ( "rust.deny-warnings=false" )
208
+ } else {
209
+ cmd
210
+ }
193
211
}
Original file line number Diff line number Diff line change @@ -407,13 +407,18 @@ fn main() -> anyhow::Result<()> {
407
407
for target in [
408
408
"rust-docs" ,
409
409
"rustc-docs" ,
410
+ "rustc-dev" ,
411
+ "rust-dev" ,
410
412
"rust-docs-json" ,
411
413
"rust-analyzer" ,
412
414
"rustc-src" ,
415
+ "extended" ,
413
416
"clippy" ,
414
417
"miri" ,
415
418
"rustfmt" ,
416
419
"gcc" ,
420
+ "generate-copyright" ,
421
+ "bootstrap" ,
417
422
] {
418
423
build_args. extend ( [ "--skip" . to_string ( ) , target. to_string ( ) ] ) ;
419
424
}
You can’t perform that action at this time.
0 commit comments