From 3b36537dc9dabe45cc030d1243b890535cedd6dc Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Sun, 29 Sep 2019 23:02:49 +0300 Subject: [PATCH] Proper Android linker flags. --- konan/konan.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/konan/konan.properties b/konan/konan.properties index 0aa9aec9cba..a1384376eea 100644 --- a/konan/konan.properties +++ b/konan/konan.properties @@ -469,7 +469,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 -lstdc++ -landroid -llog -latomic +linkerKonanFlags.android_arm32 = -lm -lc++_static -landroid -llog -latomic # Android ARM64, based on NDK. targetToolchain.macos_x64-android_arm64 = target-toolchain-2-osx-android_ndk @@ -496,7 +496,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 -lstdc++ -landroid -llog -latomic +linkerKonanFlags.android_arm64 = -lm -lc++_static -landroid -llog -latomic linkerNoDebugFlags.android_arm64 = -Wl,-S # Android X86, based on NDK. @@ -524,7 +524,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 -lstdc++ -landroid -llog -latomic +linkerKonanFlags.android_x86 = -lm -lc++_static -landroid -llog -latomic linkerNoDebugFlags.android_x86 = -Wl,-S # Android X64, based on NDK. @@ -552,7 +552,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 -lstdc++ -landroid -llog -latomic +linkerKonanFlags.android_x64 = -lm -lc++_static -landroid -llog -latomic linkerNoDebugFlags.android_x64 = -Wl,-S