Skip to content

Commit

Permalink
Avoid dynamic linking to libstd in command-current-dir test
Browse files Browse the repository at this point in the history
  • Loading branch information
Kobzol committed Oct 4, 2024
1 parent 2cf1559 commit f59c8ff
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/bootstrap/src/core/build_steps/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1928,8 +1928,8 @@ impl Step for Assemble {
let is_dylib_or_debug = is_dylib(&filename) || is_debug_info(&filename);

// If we link statically to stdlib, do not copy the libstd dynamic library file
// Currently, we do not avoid the copy on Windows, as it seems to be causing issues in
// post-optimization stage0 tests.
// FIXME: Also do this for Windows once incremental post-optimization stage0 tests
// work without std.dll (see https://github.com/rust-lang/rust/pull/131188).
let can_be_rustc_dynamic_dep = if builder
.link_std_into_rustc_driver(target_compiler.host)
&& !target_compiler.host.is_windows()
Expand Down
1 change: 1 addition & 0 deletions tests/ui/command/command-current-dir.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//@ run-pass
//@ no-prefer-dynamic We move the binary around, so do not depend dynamically on libstd
//@ ignore-wasm32 no processes
//@ ignore-sgx no processes
//@ ignore-fuchsia Needs directory creation privilege
Expand Down

0 comments on commit f59c8ff

Please sign in to comment.