summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xandroid/build.py6
1 files 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)