From a076f2b9b48af47a2f85f579069424d88d850915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Sat, 23 Oct 2021 14:34:33 +0200 Subject: [PATCH] Repace use of `static_nobundle` with `native_link_modifiers` This fixes warning 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) ``` --- compiler/rustc_llvm/build.rs | 4 ++-- compiler/rustc_llvm/src/lib.rs | 2 +- library/unwind/src/lib.rs | 1 - src/test/run-make-fulldeps/foreign-exceptions/foo.rs | 2 +- src/test/run-make-fulldeps/tools.mk | 2 +- src/test/run-make/issue-36710/foo.rs | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs index 36a6d2cc33a..943ce589c4f 100644 --- a/compiler/rustc_llvm/build.rs +++ b/compiler/rustc_llvm/build.rs @@ -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"); } } diff --git a/compiler/rustc_llvm/src/lib.rs b/compiler/rustc_llvm/src/lib.rs index 6493bd91ca2..8476c2bfcc4 100644 --- a/compiler/rustc_llvm/src/lib.rs +++ b/compiler/rustc_llvm/src/lib.rs @@ -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. diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs index e263780bf38..079626f0fea 100644 --- a/library/unwind/src/lib.rs +++ b/library/unwind/src/lib.rs @@ -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))] diff --git a/src/test/run-make-fulldeps/foreign-exceptions/foo.rs b/src/test/run-make-fulldeps/foreign-exceptions/foo.rs index c279cf7e8bf..0919def5b9a 100644 --- a/src/test/run-make-fulldeps/foreign-exceptions/foo.rs +++ b/src/test/run-make-fulldeps/foreign-exceptions/foo.rs @@ -3,7 +3,7 @@ // C++ code. // For linking libstdc++ on MinGW -#![cfg_attr(all(windows, target_env = "gnu"), feature(static_nobundle))] +#![cfg_attr(all(windows, target_env = "gnu"), feature(native_link_modifiers))] #![feature(c_unwind)] use std::panic::{catch_unwind, AssertUnwindSafe}; diff --git a/src/test/run-make-fulldeps/tools.mk b/src/test/run-make-fulldeps/tools.mk index 3934c4725f4..bc647e138ad 100644 --- a/src/test/run-make-fulldeps/tools.mk +++ b/src/test/run-make-fulldeps/tools.mk @@ -120,7 +120,7 @@ else # So we end up with the following hack: we link use static-nobundle 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++ endif else ifeq ($(UNAME),Darwin) diff --git a/src/test/run-make/issue-36710/foo.rs b/src/test/run-make/issue-36710/foo.rs index 845844f427b..a78e8294881 100644 --- a/src/test/run-make/issue-36710/foo.rs +++ b/src/test/run-make/issue-36710/foo.rs @@ -1,7 +1,7 @@ // 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))] +#![cfg_attr(all(windows, target_env = "gnu"), feature(native_link_modifiers))] extern "C" { fn get() -> u32;