mirror of
https://github.com/rust-lang/rust.git
synced 2024-10-31 22:41:50 +00:00
Auto merge of #90205 - mati865:link-modifiers-in-rustc, r=petrochenkov
Repace use of `static_nobundle` with `native_link_modifiers` within Rust codebase This fixes warnings when building Rust and running tests: ``` warning: library kind `static-nobundle` has been superseded by specifying `-bundle` on library kind `static`. Try `static:-bundle` warning: `rustc_llvm` (lib) generated 2 warnings (1 duplicate) ```
This commit is contained in:
commit
2609fab8e4
@ -288,7 +288,7 @@ fn main() {
|
||||
let path = PathBuf::from(s);
|
||||
println!("cargo:rustc-link-search=native={}", path.parent().unwrap().display());
|
||||
if target.contains("windows") {
|
||||
println!("cargo:rustc-link-lib=static-nobundle={}", stdcppname);
|
||||
println!("cargo:rustc-link-lib=static:-bundle={}", stdcppname);
|
||||
} else {
|
||||
println!("cargo:rustc-link-lib=static={}", stdcppname);
|
||||
}
|
||||
@ -302,6 +302,6 @@ fn main() {
|
||||
// Libstdc++ depends on pthread which Rust doesn't link on MinGW
|
||||
// since nothing else requires it.
|
||||
if target.contains("windows-gnu") {
|
||||
println!("cargo:rustc-link-lib=static-nobundle=pthread");
|
||||
println!("cargo:rustc-link-lib=static:-bundle=pthread");
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
#![feature(nll)]
|
||||
#![feature(static_nobundle)]
|
||||
#![feature(native_link_modifiers)]
|
||||
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
|
||||
|
||||
// NOTE: This crate only exists to allow linking on mingw targets.
|
||||
|
@ -5,7 +5,6 @@
|
||||
#![feature(native_link_modifiers_bundle)]
|
||||
#![feature(nll)]
|
||||
#![feature(staged_api)]
|
||||
#![feature(static_nobundle)]
|
||||
#![feature(c_unwind)]
|
||||
#![cfg_attr(not(target_env = "msvc"), feature(libc))]
|
||||
|
||||
|
@ -2,8 +2,6 @@
|
||||
// are caught by catch_unwind. Also tests that Rust panics can unwind through
|
||||
// C++ code.
|
||||
|
||||
// For linking libstdc++ on MinGW
|
||||
#![cfg_attr(all(windows, target_env = "gnu"), feature(static_nobundle))]
|
||||
#![feature(c_unwind)]
|
||||
|
||||
use std::panic::{catch_unwind, AssertUnwindSafe};
|
||||
|
@ -117,10 +117,10 @@ else
|
||||
# that it is compiled with the expectation that pthreads is dynamically
|
||||
# linked as a DLL and will fail to link with a statically linked libpthread.
|
||||
#
|
||||
# So we end up with the following hack: we link use static-nobundle to only
|
||||
# So we end up with the following hack: we link use static:-bundle to only
|
||||
# link the parts of libstdc++ that we actually use, which doesn't include
|
||||
# the dependency on the pthreads DLL.
|
||||
EXTRARSCXXFLAGS := -l static-nobundle=stdc++
|
||||
EXTRARSCXXFLAGS := -l static:-bundle=stdc++ -Z unstable-options
|
||||
endif
|
||||
else
|
||||
ifeq ($(UNAME),Darwin)
|
||||
|
@ -1,8 +1,5 @@
|
||||
// Tests that linking to C++ code with global destructors works.
|
||||
|
||||
// For linking libstdc++ on MinGW
|
||||
#![cfg_attr(all(windows, target_env = "gnu"), feature(static_nobundle))]
|
||||
|
||||
extern "C" {
|
||||
fn get() -> u32;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user