Skip to content

Commit

Permalink
Android: Add the required linker flags for unwinding on armeabi-v7a
Browse files Browse the repository at this point in the history
These flags are indicated as required for armeabi-v7a here:
https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md#Unwinding

Pick-to: 5.15
Change-Id: Id2bbfc65c4ed9bda29692869a719dbab70891491
Reviewed-by: Assam Boudjelthia <[email protected]>
  • Loading branch information
AndyShawQt committed Nov 12, 2020
1 parent 5d8a04f commit 85fe4c8
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions mkspecs/features/android/default_pre.prf
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ QMAKE_CFLAGS += -fno-limit-debug-info

QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS

equals(ANDROID_TARGET_ARCH, armeabi-v7a): \
QMAKE_LINK += -Wl,--exclude-libs,libunwind.a

ANDROID_STDCPP_PATH = $$NDK_LLVM_PATH/sysroot/usr/lib/

# -fstack-protector-strong offers good protection against stack smashing attacks.
Expand Down

0 comments on commit 85fe4c8

Please sign in to comment.