Skip to content

Commit 533247c

Browse files
committed
Add -Zunstable-options instead of feature
1 parent a076f2b commit 533247c

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

src/test/run-make-fulldeps/foreign-exceptions/foo.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// are caught by catch_unwind. Also tests that Rust panics can unwind through
33
// C++ code.
44

5-
// For linking libstdc++ on MinGW
6-
#![cfg_attr(all(windows, target_env = "gnu"), feature(native_link_modifiers))]
75
#![feature(c_unwind)]
86

97
use std::panic::{catch_unwind, AssertUnwindSafe};

src/test/run-make-fulldeps/tools.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ else
117117
# that it is compiled with the expectation that pthreads is dynamically
118118
# linked as a DLL and will fail to link with a statically linked libpthread.
119119
#
120-
# So we end up with the following hack: we link use static-nobundle to only
120+
# So we end up with the following hack: we link use static:-bundle to only
121121
# link the parts of libstdc++ that we actually use, which doesn't include
122122
# the dependency on the pthreads DLL.
123-
EXTRARSCXXFLAGS := -l static:-bundle=stdc++
123+
EXTRARSCXXFLAGS := -l static:-bundle=stdc++ -Z unstable-options
124124
endif
125125
else
126126
ifeq ($(UNAME),Darwin)

src/test/run-make/issue-36710/foo.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// Tests that linking to C++ code with global destructors works.
22

3-
// For linking libstdc++ on MinGW
4-
#![cfg_attr(all(windows, target_env = "gnu"), feature(native_link_modifiers))]
5-
63
extern "C" {
74
fn get() -> u32;
85
}

0 commit comments

Comments
 (0)