File tree Expand file tree Collapse file tree 3 files changed +7
-16
lines changed
crates/macos_frames_test/tests Expand file tree Collapse file tree 3 files changed +7
-16
lines changed Original file line number Diff line number Diff line change 66// so that it gets its own 'target' directory. We manually invoke this test
77// in .github/workflows/main.yml by passing `--manifest-path` to Cargo
88#[ test]
9- #[ cfg( target_os = "macos " ) ]
9+ #[ cfg( target_vendor = "apple " ) ]
1010fn backtrace_no_dsym ( ) {
1111 use std:: { env, fs} ;
1212
Original file line number Diff line number Diff line change @@ -30,15 +30,16 @@ cfg_if::cfg_if! {
3030 if #[ cfg( windows) ] {
3131 #[ path = "gimli/mmap_windows.rs" ]
3232 mod mmap;
33+ } else if #[ cfg( target_vendor = "apple" ) ] {
34+ #[ path = "gimli/mmap_unix.rs" ]
35+ mod mmap;
3336 } else if #[ cfg( any(
3437 target_os = "android" ,
3538 target_os = "freebsd" ,
3639 target_os = "fuchsia" ,
3740 target_os = "haiku" ,
3841 target_os = "hurd" ,
39- target_os = "ios" ,
4042 target_os = "linux" ,
41- target_os = "macos" ,
4243 target_os = "openbsd" ,
4344 target_os = "solaris" ,
4445 target_os = "illumos" ,
@@ -195,12 +196,7 @@ cfg_if::cfg_if! {
195196 if #[ cfg( windows) ] {
196197 mod coff;
197198 use self :: coff:: { handle_split_dwarf, Object } ;
198- } else if #[ cfg( any(
199- target_os = "macos" ,
200- target_os = "ios" ,
201- target_os = "tvos" ,
202- target_os = "watchos" ,
203- ) ) ] {
199+ } else if #[ cfg( any( target_vendor = "apple" ) ) ] {
204200 mod macho;
205201 use self :: macho:: { handle_split_dwarf, Object } ;
206202 } else if #[ cfg( target_os = "aix" ) ] {
@@ -216,12 +212,7 @@ cfg_if::cfg_if! {
216212 if #[ cfg( windows) ] {
217213 mod libs_windows;
218214 use libs_windows:: native_libraries;
219- } else if #[ cfg( any(
220- target_os = "macos" ,
221- target_os = "ios" ,
222- target_os = "tvos" ,
223- target_os = "watchos" ,
224- ) ) ] {
215+ } else if #[ cfg( target_vendor = "apple" ) ] {
225216 mod libs_macos;
226217 use libs_macos:: native_libraries;
227218 } else if #[ cfg( target_os = "illumos" ) ] {
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ fn doit() {
3131 dir. pop ( ) ;
3232 if cfg ! ( windows) {
3333 dir. push ( "dylib_dep.dll" ) ;
34- } else if cfg ! ( target_os = "macos " ) {
34+ } else if cfg ! ( target_vendor = "apple " ) {
3535 dir. push ( "libdylib_dep.dylib" ) ;
3636 } else if cfg ! ( target_os = "aix" ) {
3737 dir. push ( "libdylib_dep.a" ) ;
You can’t perform that action at this time.
0 commit comments