From 41a0132fe99f93dac07e874814fe385fd31f970e Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Thu, 27 Aug 2020 23:13:17 +0200 Subject: [PATCH] shared c++ --- distribute.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distribute.sh b/distribute.sh index 3644b5b..0556683 100755 --- a/distribute.sh +++ b/distribute.sh @@ -193,7 +193,7 @@ function push_arm() { export CFLAGS="$CFLAGS -isystem $ANDROIDNDK/sysroot/usr/include -isystem $ANDROIDNDK/sysroot/usr/include/$TOOLCHAIN_SHORT_PREFIX" export CFLAGS="$CFLAGS -D__ANDROID_API__=$ANDROIDAPI" - export CXXFLAGS="$CFLAGS" + export CXXFLAGS="$CFLAGS -stdlib=libc++" export CPPFLAGS="$CFLAGS" if [ "X${ARCH}" == "Xarmeabi-v7a" ]; then @@ -211,7 +211,7 @@ function push_arm() { ANDROID_CMAKE_LINKER_FLAGS="$ANDROID_CMAKE_LINKER_FLAGS;-Wl,-rpath=$QT_ANDROID/lib" ANDROID_CMAKE_LINKER_FLAGS="$ANDROID_CMAKE_LINKER_FLAGS;-Wl,-rpath=$ANDROIDNDK/platforms/android-$ANDROIDAPI/arch-$QT_ARCH_PREFIX/usr/lib" ANDROID_CMAKE_LINKER_FLAGS="$ANDROID_CMAKE_LINKER_FLAGS;-Wl,-rpath=$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH" - export LDFLAGS="-Wl,-rpath=$STAGE_PATH/lib $LDFLAGS" + export LDFLAGS="-Wl,-rpath=$STAGE_PATH/lib -Wl,-rpath=$ANDROIDNDK/sources/cxx-stl/llvm-libc++/libs/$ARCH $LDFLAGS" fi export PATH="$ANDROIDNDK/toolchains/llvm/prebuilt/$PYPLATFORM-x86_64/bin/:$ANDROIDSDK/tools:$ANDROIDNDK:$QT_ANDROID/bin:$PATH"