shared c++

opengisch · Aug 27, 2020 · 41a0132 · 41a0132
1 parent 85a4799
commit 41a0132
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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"