Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix building libstd with cfg(miri) #60469

Closed
wants to merge 3 commits into from
Closed

fix building libstd with cfg(miri) #60469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38f69c5
fix building libstd with cfg(miri)
RalfJung May 2, 2019
78b6420
explain why we need framework=Security with cfg(miri)
RalfJung May 3, 2019
3f16e2b
update miri
RalfJung May 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/libstd/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ fn main() {
println!("cargo:rustc-link-lib=resolv");
} else if target.contains("apple-darwin") {
println!("cargo:rustc-link-lib=System");
#[cfg(miri)]
// With Miri, we use SecRandomCopyBytes got randomness, so we need to link
// with `framework=Security`.
println!("cargo:rustc-link-lib=framework=Security");

// res_init and friends require -lresolv on macOS/iOS.
// See #41582 and http://blog.achernya.com/2013/03/os-x-has-silly-libsystem.html
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Open in desktop
Submodule miri updated 4 files
+1 −1 rust-version
+6 −9 src/bin/cargo-miri.rs
+2 −2 src/helpers.rs
+3 −10 tests/run-pass/hashmap.rs