Skip to content

Commit e4da938

Browse files
committed
[remove -fstack-protector-strong and enable LLVM assertions]
1 parent c756f81 commit e4da938

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

.github/actions/3-build-cross/action.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ runs:
3535
fi
3636
3737
if [[ '${{ inputs.os }}' == android ]]; then
38-
assertsSuffix=""
38+
assertsSuffix="-withAsserts"
3939
else
4040
# Use assertions for untagged builds. Must be the same as for the host LLVM package, because
4141
# llvm-config of host package will be used for the cross build configuration.
@@ -97,6 +97,9 @@ runs:
9797
mv "android-ndk-$version" android-ndk
9898
rm android-ndk.zip
9999
100+
# remove the implicit -fstack-protector-strong
101+
sed -i 's|^ " -fstack-protector-strong"$||' android-ndk/build/cmake/flags.cmake
102+
100103
arch='${{ inputs.arch }}'
101104
apiLevel='${{ inputs.android_api_level }}'
102105
cmakeFlags="-DTARGET_SYSTEM='Android;Linux;UNIX'"

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
env:
17-
LLVM_VERSION: 2846ebab
17+
LLVM_VERSION: bdd275b6
1818

1919
jobs:
2020
build-native:

0 commit comments

Comments
 (0)