From f7d1408a1afd00c9a7f164dae6a82707bc83df6e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 23 Oct 2018 19:32:25 +0200 Subject: [PATCH] android/build.py: improved libc++ linker flags (for NDK r18) The flag `-stdlib=libc++` doesn't appear to work because it attempts to load `libc++` and not `libc++_static`, and it omits `libc++abi`. --- android/build.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/android/build.py b/android/build.py index caf85f06c..a51dbe3b6 100755 --- a/android/build.py +++ b/android/build.py @@ -132,13 +132,15 @@ class AndroidNdkToolchain: libcxx_path = os.path.join(ndk_path, 'sources/cxx-stl/llvm-libc++') libcxx_libs_path = os.path.join(libcxx_path, 'libs', android_abi) - libstdcxx_flags = '-stdlib=libc++' + libstdcxx_flags = '' libstdcxx_cxxflags = libstdcxx_flags + ' -isystem ' + os.path.join(libcxx_path, 'include') + ' -isystem ' + os.path.join(ndk_path, 'sources/android/support/include') - libstdcxx_ldflags = libstdcxx_flags + ' -static-libstdc++ -L' + libcxx_libs_path + libstdcxx_ldflags = libstdcxx_flags + ' -L' + libcxx_libs_path + libstdcxx_libs = '-lc++_static -lc++abi' if use_cxx: self.cxxflags += ' ' + libstdcxx_cxxflags self.ldflags += ' ' + libstdcxx_ldflags + self.libs += ' ' + libstdcxx_libs self.env = dict(os.environ)