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 6
6
// so that it gets its own 'target' directory. We manually invoke this test
7
7
// in .github/workflows/main.yml by passing `--manifest-path` to Cargo
8
8
#[ test]
9
- #[ cfg( target_os = "macos " ) ]
9
+ #[ cfg( target_vendor = "apple " ) ]
10
10
fn backtrace_no_dsym ( ) {
11
11
use std:: { env, fs} ;
12
12
Original file line number Diff line number Diff line change @@ -30,15 +30,16 @@ cfg_if::cfg_if! {
30
30
if #[ cfg( windows) ] {
31
31
#[ path = "gimli/mmap_windows.rs" ]
32
32
mod mmap;
33
+ } else if #[ cfg( target_vendor = "apple" ) ] {
34
+ #[ path = "gimli/mmap_unix.rs" ]
35
+ mod mmap;
33
36
} else if #[ cfg( any(
34
37
target_os = "android" ,
35
38
target_os = "freebsd" ,
36
39
target_os = "fuchsia" ,
37
40
target_os = "haiku" ,
38
41
target_os = "hurd" ,
39
- target_os = "ios" ,
40
42
target_os = "linux" ,
41
- target_os = "macos" ,
42
43
target_os = "openbsd" ,
43
44
target_os = "solaris" ,
44
45
target_os = "illumos" ,
@@ -195,12 +196,7 @@ cfg_if::cfg_if! {
195
196
if #[ cfg( windows) ] {
196
197
mod coff;
197
198
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" ) ) ] {
204
200
mod macho;
205
201
use self :: macho:: { handle_split_dwarf, Object } ;
206
202
} else if #[ cfg( target_os = "aix" ) ] {
@@ -216,12 +212,7 @@ cfg_if::cfg_if! {
216
212
if #[ cfg( windows) ] {
217
213
mod libs_windows;
218
214
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" ) ] {
225
216
mod libs_macos;
226
217
use libs_macos:: native_libraries;
227
218
} else if #[ cfg( target_os = "illumos" ) ] {
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ fn doit() {
31
31
dir. pop ( ) ;
32
32
if cfg ! ( windows) {
33
33
dir. push ( "dylib_dep.dll" ) ;
34
- } else if cfg ! ( target_os = "macos " ) {
34
+ } else if cfg ! ( target_vendor = "apple " ) {
35
35
dir. push ( "libdylib_dep.dylib" ) ;
36
36
} else if cfg ! ( target_os = "aix" ) {
37
37
dir. push ( "libdylib_dep.a" ) ;
You can’t perform that action at this time.
0 commit comments