Skip to content

Commit f59c8ff

Browse files
committed
Avoid dynamic linking to libstd in command-current-dir test
1 parent 2cf1559 commit f59c8ff

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/bootstrap/src/core/build_steps/compile.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1928,8 +1928,8 @@ impl Step for Assemble {
19281928
let is_dylib_or_debug = is_dylib(&filename) || is_debug_info(&filename);
19291929

19301930
// If we link statically to stdlib, do not copy the libstd dynamic library file
1931-
// Currently, we do not avoid the copy on Windows, as it seems to be causing issues in
1932-
// post-optimization stage0 tests.
1931+
// FIXME: Also do this for Windows once incremental post-optimization stage0 tests
1932+
// work without std.dll (see https://github.com/rust-lang/rust/pull/131188).
19331933
let can_be_rustc_dynamic_dep = if builder
19341934
.link_std_into_rustc_driver(target_compiler.host)
19351935
&& !target_compiler.host.is_windows()

tests/ui/command/command-current-dir.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ run-pass
2+
//@ no-prefer-dynamic We move the binary around, so do not depend dynamically on libstd
23
//@ ignore-wasm32 no processes
34
//@ ignore-sgx no processes
45
//@ ignore-fuchsia Needs directory creation privilege

0 commit comments

Comments
 (0)