File tree Expand file tree Collapse file tree 3 files changed +2
-7
lines changed Expand file tree Collapse file tree 3 files changed +2
-7
lines changed Original file line number Diff line number Diff line change 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
97use std:: panic:: { catch_unwind, AssertUnwindSafe } ;
Original file line number Diff line number Diff 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
124124endif
125125else
126126ifeq ($(UNAME ) ,Darwin)
Original file line number Diff line number Diff line change 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-
63extern "C" {
74 fn get ( ) -> u32 ;
85}
You can’t perform that action at this time.
0 commit comments