diff options
| -rwxr-xr-x | configure-android | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure-android b/configure-android index a27057e2..e1655a4a 100755 --- a/configure-android +++ b/configure-android @@ -115,7 +115,7 @@ if test "$1" = "--use-ndk-cflags"; then export AR=`echo ${NDK_CXX}|sed 's/-g++/-ar/'`; export RANLIB=`echo ${NDK_CXX}|sed 's/-g++/-ranlib/'`; - export LDFLAGS="${LDFLAGS} -nostdlib -L${ANDROID_SYSROOT}${USR_LIB}" + export LDFLAGS="${LDFLAGS} --sysroot=${ANDROID_SYSROOT}" export LIBS="${LIBS} -lc -lgcc -ldl" export CFLAGS="${NDK_CFLAGS} ${CFLAGS}" export CPPFLAGS="${CFLAGS} -fexceptions -frtti" @@ -148,9 +148,9 @@ else export AR="${ANDROID_TC}/bin/${TARGET_HOST}-ar" export RANLIB="${ANDROID_TC}/bin/${TARGET_HOST}-ranlib" - export LDFLAGS="${LDFLAGS} -nostdlib -L${ANDROID_SYSROOT}${USR_LIB}" + export LDFLAGS="${LDFLAGS} --sysroot=${ANDROID_SYSROOT}" export LIBS="${LIBS} -lc -lgcc" - export CFLAGS="${CFLAGS} -I${ANDROID_SYSROOT}/usr/include" + export CFLAGS="${CFLAGS} --sysroot=${ANDROID_SYSROOT}" export CPPFLAGS="${CFLAGS} -fexceptions -frtti" export CXXFLAGS="${CXXFLAGS} -shared --sysroot=${ANDROID_SYSROOT} -fexceptions -frtti" @@ -167,12 +167,12 @@ fi # gnustl STDCPP_TC_VER=`ls -d ${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/[0-9]* | sort -gr | head -1` STDCPP_CFLAGS="-I${STDCPP_TC_VER}/include -I${STDCPP_TC_VER}/libs/${TARGET_ABI}/include" -STDCPP_LIBS="${ANDROID_SYSROOT}${USR_LIB}/crtbegin_so.o -lgnustl_static" +STDCPP_LIBS="-lgnustl_static" STDCPP_LDFLAGS="-L${STDCPP_TC_VER}/libs/${TARGET_ABI}/" # stlport #STDCPP_CFLAGS="-I${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/stlport" -#STDCPP_LIBS="${ANDROID_SYSROOT}${USR_LIB}/crtbegin_so.o -lstlport_static -ldl" +#STDCPP_LIBS="-lstlport_static -ldl" #STDCPP_LDFLAGS="-L${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/${TARGET_ABI}" export CFLAGS="${CFLAGS} ${STDCPP_CFLAGS}" |