@@ -104,14 +104,8 @@ fn setup() -> Setup {
104
104
// to ensure nothing is required.
105
105
// See https://github.com/rust-lang/wg-cargo-std-aware/issues/31
106
106
// for more information on this.
107
- //
108
- // FIXME: this is broken on x86_64-unknown-linux-gnu
109
- // due to https://github.com/rust-lang/rust/pull/124129,
110
- // because it requires lld in the sysroot. See
111
- // https://github.com/rust-lang/rust/issues/125246 for
112
- // more information.
113
- // args.push("--sysroot".to_string());
114
- // args.push("/path/to/nowhere".to_string());
107
+ args.push("--sysroot".to_string());
108
+ args.push("/path/to/nowhere".to_string());
115
109
} else {
116
110
// host unit, do not use sysroot
117
111
}
@@ -298,20 +292,16 @@ fn shared_std_dependency_rebuild() {
298
292
"# ] ] )
299
293
. run ( ) ;
300
294
301
- // TODO: Because of the way in which std is resolved, it's mandatory that this is left commented
302
- // out as it will fail. This case should result in `dep_test` only being built once, however
303
- // it's still being built twice. This is a bug.
304
- //
305
- // p.cargo("build -v")
306
- // .build_std(&setup)
307
- // .with_stderr_does_not_contain(str![[r#"
308
- //...
309
- //[RUNNING] `[..] rustc --crate-name dep_test [..]`
310
- //...
311
- //[RUNNING] `[..] rustc --crate-name dep_test [..]`
312
- //...
313
- //"#]])
314
- // .run();
295
+ p. cargo ( "build -v" )
296
+ . build_std ( & setup)
297
+ . with_stderr_does_not_contain ( str![ [ r#"
298
+ ...
299
+ [RUNNING] `[..] rustc --crate-name dep_test [..]`
300
+ ...
301
+ [RUNNING] `[..] rustc --crate-name dep_test [..]`
302
+ ...
303
+ "# ] ] )
304
+ . run ( ) ;
315
305
}
316
306
317
307
#[ cargo_test( build_std_mock) ]
0 commit comments