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: improved libc++ linker flags (for NDK r18)
f7d1408a · Max Kellermann · e4e14ef6 · f7d1408a
Commit f7d1408a authored Oct 23, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

build.py android/build.py +4 -2

No files found.
--- 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)