Skip to content

Commit 22b51b0

Browse files
committed
Enable exceptions explicitly on Android in CI
After c52806157c97105da7fdc2b021d0a0fcd5186bf3, BoringSSL requires a C++ runtime in libssl, but the NDK doesn't enable C++ exceptions by default.
1 parent 20acdd6 commit 22b51b0

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,9 @@ jobs:
233233
- name: Set Android Linker path
234234
if: endsWith(matrix.thing, '-android')
235235
run: echo "CARGO_TARGET_$(echo ${{ matrix.target }} | tr \\-a-z _A-Z)_LINKER=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/$(echo ${{ matrix.target }} | sed s/armv7/armv7a/)21-clang++" >> "$GITHUB_ENV"
236+
- name: Enable exceptions explicitly on Android
237+
if: endsWith(matrix.thing, '-android')
238+
run: echo CXXFLAGS=-fexceptions >> "$GITHUB_ENV"
236239
- name: Build tests
237240
# We `build` because we want the linker to verify we are cross-compiling correctly for check-only targets.
238241
run: cargo build --target ${{ matrix.target }} --tests ${{ matrix.extra_test_args }}

0 commit comments

Comments
 (0)