Skip to content

Commit 82bc845

Browse files
committed
Fix iOS/tvOS builds: Rust target, vendored deps, nightly toolchain
- Set Rust_CARGO_TARGET for iOS (aarch64-apple-ios) and tvOS (aarch64-apple-tvos) presets so Corrosion doesn't fall back to host target - Disable find_package for BZip2, LibLZMA, and zstd on iOS/tvOS to force vendoring (system libs are for host, not target) - Add rustup target install for iOS in CI - Install nightly Rust + rust-src for tvOS (tier 3 target) - Set Rust_TOOLCHAIN=nightly and NOD_BUILD_STD=ON for tvOS preset - Update nod submodule to nod-ci-fixes branch with -Zbuild-std support via NOD_BUILD_STD option
1 parent 1f2b790 commit 82bc845

File tree

3 files changed

+40
-1
lines changed

3 files changed

+40
-1
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ jobs:
192192
brew install cmake ninja
193193
pip3 install --break-system-packages markupsafe
194194
195+
- name: Install Rust iOS target
196+
run: rustup target add aarch64-apple-ios
197+
195198
- name: Verify CMake version
196199
run: cmake --version
197200

@@ -230,6 +233,11 @@ jobs:
230233
brew install cmake ninja
231234
pip3 install --break-system-packages markupsafe
232235
236+
- name: Install Rust nightly (tvOS is a tier 3 target)
237+
run: |
238+
rustup toolchain install nightly
239+
rustup +nightly component add rust-src
240+
233241
- name: Verify CMake version
234242
run: cmake --version
235243

CMakePresets.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,19 @@
246246
"ENABLE_BITCODE": {
247247
"type": "BOOL",
248248
"value": false
249+
},
250+
"Rust_CARGO_TARGET": "aarch64-apple-ios",
251+
"CMAKE_DISABLE_FIND_PACKAGE_BZip2": {
252+
"type": "BOOL",
253+
"value": true
254+
},
255+
"CMAKE_DISABLE_FIND_PACKAGE_LibLZMA": {
256+
"type": "BOOL",
257+
"value": true
258+
},
259+
"CMAKE_DISABLE_FIND_PACKAGE_zstd": {
260+
"type": "BOOL",
261+
"value": true
249262
}
250263
},
251264
"vendor": {
@@ -269,6 +282,24 @@
269282
"ENABLE_BITCODE": {
270283
"type": "BOOL",
271284
"value": false
285+
},
286+
"Rust_CARGO_TARGET": "aarch64-apple-tvos",
287+
"Rust_TOOLCHAIN": "nightly",
288+
"NOD_BUILD_STD": {
289+
"type": "BOOL",
290+
"value": true
291+
},
292+
"CMAKE_DISABLE_FIND_PACKAGE_BZip2": {
293+
"type": "BOOL",
294+
"value": true
295+
},
296+
"CMAKE_DISABLE_FIND_PACKAGE_LibLZMA": {
297+
"type": "BOOL",
298+
"value": true
299+
},
300+
"CMAKE_DISABLE_FIND_PACKAGE_zstd": {
301+
"type": "BOOL",
302+
"value": true
272303
}
273304
},
274305
"vendor": {

extern/nod

Submodule nod updated 1 file

0 commit comments

Comments
 (0)