File tree 3 files changed +2
-7
lines changed
3 files changed +2
-7
lines changed Original file line number Diff line number Diff line change 2
2
// are caught by catch_unwind. Also tests that Rust panics can unwind through
3
3
// C++ code.
4
4
5
- // For linking libstdc++ on MinGW
6
- #![ cfg_attr( all( windows, target_env = "gnu" ) , feature( native_link_modifiers) ) ]
7
5
#![ feature( c_unwind) ]
8
6
9
7
use std:: panic:: { catch_unwind, AssertUnwindSafe } ;
Original file line number Diff line number Diff line change @@ -117,10 +117,10 @@ else
117
117
# that it is compiled with the expectation that pthreads is dynamically
118
118
# linked as a DLL and will fail to link with a statically linked libpthread.
119
119
#
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
121
121
# link the parts of libstdc++ that we actually use, which doesn't include
122
122
# the dependency on the pthreads DLL.
123
- EXTRARSCXXFLAGS := -l static:-bundle=stdc++
123
+ EXTRARSCXXFLAGS := -l static:-bundle=stdc++ -Z unstable-options
124
124
endif
125
125
else
126
126
ifeq ($(UNAME ) ,Darwin)
Original file line number Diff line number Diff line change 1
1
// Tests that linking to C++ code with global destructors works.
2
2
3
- // For linking libstdc++ on MinGW
4
- #![ cfg_attr( all( windows, target_env = "gnu" ) , feature( native_link_modifiers) ) ]
5
-
6
3
extern "C" {
7
4
fn get ( ) -> u32 ;
8
5
}
You can’t perform that action at this time.
0 commit comments