diff options
| author | Emīls <emils@mullvad.net> | 2024-02-02 13:49:34 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2024-02-02 13:49:34 +0100 |
| commit | 6328b942bbd713dee109a9d715a6e53a2be1ac92 (patch) | |
| tree | dcd8884066cf86ccfe17012cd3d3dca1f068328c | |
| parent | d50f11e6211bedf6a3c0cfcd285be9a08f1d7cab (diff) | |
| parent | f1f3d2f2135a0b58902059c5c87f461c124831df (diff) | |
| download | mullvadvpn-6328b942bbd713dee109a9d715a6e53a2be1ac92.tar.xz mullvadvpn-6328b942bbd713dee109a9d715a6e53a2be1ac92.zip | |
Merge branch 'fix-ios-rust-buildscript'
| -rw-r--r-- | .github/workflows/ios.yml | 1 | ||||
| -rw-r--r-- | ios/build-rust-library.sh | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 5d8cdb7034..ba5cb823f4 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - .github/workflows/ios.yml + - ios/build-rust-library.sh - ios/.swiftformat - ios/**/*.swift - ios/**/*.xctestplan diff --git a/ios/build-rust-library.sh b/ios/build-rust-library.sh index 958b083dc0..e5aed20691 100644 --- a/ios/build-rust-library.sh +++ b/ios/build-rust-library.sh @@ -43,17 +43,17 @@ for arch in $ARCHS; do # Intel iOS simulator export CFLAGS_x86_64_apple_ios="-target x86_64-apple-ios" - "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib "$RELFLAG" --target x86_64-apple-ios + "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib $RELFLAG --target x86_64-apple-ios "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib --target x86_64-apple-ios ;; arm64) if [ $IS_SIMULATOR -eq 0 ]; then # Hardware iOS targets - "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib "$RELFLAG" --target aarch64-apple-ios + "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib $RELFLAG --target aarch64-apple-ios "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib --target aarch64-apple-ios else - "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib "$RELFLAG" --target aarch64-apple-ios-sim + "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib $RELFLAG --target aarch64-apple-ios-sim "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib --target aarch64-apple-ios-sim fi esac |