Fix C++ ABI libraries on Android. (JetBrains#3599)

89jd · Nov 21, 2019 · ec6fa2d · ec6fa2d
1 parent 106f80d
commit ec6fa2d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/konan/konan.properties b/konan/konan.properties
@@ -496,7 +496,7 @@ clangOptFlags.android_arm32 = -O3 -ffunction-sections
 linkerNoDebugFlags.android_arm32 = -Wl,-S
 clangNooptFlags.android_arm32 = -O1
 targetSysRoot.android_arm32 = target-sysroot-1-android_ndk
-linkerKonanFlags.android_arm32 = -lm -lc++_static -landroid -llog -latomic
+linkerKonanFlags.android_arm32 = -lm -lc++_static -lc++abi -landroid -llog -latomic
 
 # Android ARM64, based on NDK.
 targetToolchain.macos_x64-android_arm64 = target-toolchain-2-osx-android_ndk
@@ -523,7 +523,7 @@ clangFlags.android_arm64 = -cc1 -target-cpu cortex-a57 -emit-obj -disable-llvm-p
 clangOptFlags.android_arm64 = -O3 -ffunction-sections
 clangNooptFlags.android_arm64 = -O1
 targetSysRoot.android_arm64 = target-sysroot-1-android_ndk
-linkerKonanFlags.android_arm64 = -lm -lc++_static -landroid -llog -latomic
+linkerKonanFlags.android_arm64 = -lm -lc++_static -lc++abi -landroid -llog -latomic
 linkerNoDebugFlags.android_arm64 = -Wl,-S
 
 # Android X86, based on NDK.
@@ -551,7 +551,7 @@ clangFlags.android_x86 = -cc1 -target-cpu i686 -emit-obj -disable-llvm-passes -x
 clangOptFlags.android_x86 = -O3 -ffunction-sections
 clangNooptFlags.android_x86 = -O1
 targetSysRoot.android_x86 = target-sysroot-1-android_ndk
-linkerKonanFlags.android_x86 = -lm -lc++_static -landroid -llog -latomic
+linkerKonanFlags.android_x86 = -lm -lc++_static -lc++abi -landroid -llog -latomic
 linkerNoDebugFlags.android_x86 = -Wl,-S
 
 # Android X64, based on NDK.
@@ -579,7 +579,7 @@ clangFlags.android_x64 = -cc1 -target-cpu x86-64 -emit-obj -disable-llvm-passes
 clangOptFlags.android_x64 = -O3 -ffunction-sections
 clangNooptFlags.android_x64 = -O1
 targetSysRoot.android_x64 = target-sysroot-1-android_ndk
-linkerKonanFlags.android_x64 = -lm -lc++_static -landroid -llog -latomic
+linkerKonanFlags.android_x64 = -lm -lc++_static -lc++abi -landroid -llog -latomic
 linkerNoDebugFlags.android_x64 = -Wl,-S