File tree 5 files changed +11
-58
lines changed
examples/darwin-framework-tool
5 files changed +11
-58
lines changed Original file line number Diff line number Diff line change @@ -119,13 +119,10 @@ jobs:
119
119
run : |
120
120
xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos
121
121
working-directory : examples/tv-casting-app/darwin/MatterTvCastingBridge
122
- - name : Uploading .ips files in Xcode derived data to debug the failure
123
- uses : actions/upload-artifact@v4
124
- if : ${{ failure() && !env.ACT }}
125
- with :
126
- name : darwin-framework-derived-data
127
- path : ~/Library/Developer/Xcode/DerivedData/**/*.ips
128
- retention-days : 5
122
+ - name : Collect crash logs
123
+ run : |
124
+ mkdir -p /tmp/darwin/framework-tests
125
+ find ~/Library/Developer/Xcode/DerivedData /Library/Logs/DiagnosticReports -name '*.ips' -print0 | xargs -0 -J % cp % /tmp/darwin/framework-tests
129
126
- name : Uploading log files
130
127
uses : actions/upload-artifact@v4
131
128
if : ${{ failure() && !env.ACT }}
Original file line number Diff line number Diff line change @@ -76,11 +76,11 @@ if (_chip_defaults.custom_toolchain != "") {
76
76
} else {
77
77
_target_compiler = " gcc"
78
78
}
79
-
80
79
_default_toolchain = " ${ _build_overrides.build_root } /toolchain/linux:linux_${ target_cpu } _${ _target_compiler } "
81
- } else if (target_os == host_os &&
82
- (target_cpu == host_cpu ||
83
- (target_cpu == " arm64e" && host_cpu == " arm64" ))) {
80
+ } else if (host_os == " mac" && (target_os == " mac" || target_os == " ios" )) {
81
+ # On Mac the host toolchain supports building for all mac and ios targets
82
+ _default_toolchain = host_toolchain
83
+ } else if (target_os == host_os && target_cpu == host_cpu ) {
84
84
_default_toolchain = host_toolchain
85
85
} else if (target_os == " freertos" ) {
86
86
if (_chip_defaults .is_clang ) {
@@ -113,9 +113,6 @@ if (_chip_defaults.custom_toolchain != "") {
113
113
} else {
114
114
assert (false , " Unsupported target_cpu: ${ current_cpu } " )
115
115
}
116
- } else if (target_os == " ios" ) {
117
- _default_toolchain =
118
- " ${ _build_overrides.build_root } /toolchain/ios:ios_${ target_cpu } "
119
116
} else if (target_os == " tizen" ) {
120
117
_default_toolchain =
121
118
" ${ _build_overrides.build_root } /toolchain/tizen:tizen_${ target_cpu } "
Original file line number Diff line number Diff line change @@ -343,7 +343,7 @@ config("cosmetic_default") {
343
343
}
344
344
345
345
config (" runtime_default" ) {
346
- if (is_clang ) {
346
+ if (is_clang ) { # Using Pigweed clang instead of Darwin host clang
347
347
configs = [
348
348
" $dir_pw_toolchain /host_clang:no_system_libcpp" ,
349
349
" $dir_pw_toolchain /host_clang:xcode_sysroot" ,
@@ -402,7 +402,7 @@ config("sanitize_address") {
402
402
]
403
403
ldflags = cflags
404
404
405
- if (target_os == " mac" || target_os == " ios" ) {
405
+ if (( target_os == " mac" || target_os == " ios" ) && ! is_clang ) {
406
406
defines += [ " _LIBCPP_HAS_NO_ASAN" ]
407
407
}
408
408
}
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -139,6 +139,7 @@ action("build-darwin-framework") {
139
139
config (" config" ) {
140
140
include_dirs = [
141
141
" ." ,
142
+ " include" ,
142
143
" ${ chip_root } /examples/common" ,
143
144
" ${ chip_root } /examples/darwin-framework-tool/commands/common" ,
144
145
" ${ chip_root } /zzz_generated/darwin-framework-tool" ,
You can’t perform that action at this time.
0 commit comments