-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Migrate libs-through-symlink
to rmake.rs
#134829
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
//! Regression test for [rustc doesn't handle relative symlinks to libraries | ||
//! #13890](https://github.com/rust-lang/rust/issues/13890). | ||
//! | ||
//! This smoke test checks that for a given library search path `P`: | ||
//! | ||
//! - `rustc` is able to locate a library available via a symlink, where: | ||
//! - the symlink is under the directory subtree of `P`, | ||
//! - but the actual library is not (it's in a different directory subtree). | ||
//! | ||
//! For example: | ||
//! | ||
//! ```text | ||
//! actual_dir/ | ||
//! libfoo.rlib | ||
//! symlink_dir/ # $CWD set; rustc -L . bar.rs that depends on foo | ||
//! libfoo.rlib --> ../actual_dir/libfoo.rlib | ||
//! ``` | ||
//! | ||
//! Previously, if `rustc` was invoked with CWD set to `symlink_dir/`, it would fail to traverse the | ||
//! symlink to locate `actual_dir/libfoo.rlib`. This was originally fixed in | ||
//! <https://github.com/rust-lang/rust/pull/13903>. | ||
|
||
//@ ignore-cross-compile | ||
|
||
use run_make_support::{bare_rustc, cwd, path, rfs, rust_lib_name}; | ||
|
||
fn main() { | ||
let actual_lib_dir = path("actual_lib_dir"); | ||
let symlink_lib_dir = path("symlink_lib_dir"); | ||
rfs::create_dir_all(&actual_lib_dir); | ||
rfs::create_dir_all(&symlink_lib_dir); | ||
|
||
// NOTE: `bare_rustc` is used because it does not introduce an implicit `-L .` library search | ||
// flag. | ||
bare_rustc().input("foo.rs").output(actual_lib_dir.join(rust_lib_name("foo"))).run(); | ||
|
||
rfs::symlink_file( | ||
actual_lib_dir.join(rust_lib_name("foo")), | ||
symlink_lib_dir.join(rust_lib_name("foo")), | ||
); | ||
|
||
// Make rustc's $CWD be in the directory containing the symlink-to-lib. | ||
bare_rustc() | ||
.current_dir(&symlink_lib_dir) | ||
.library_search_path(".") | ||
.input(cwd().join("bar.rs")) | ||
.run(); | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.