diff options
Diffstat (limited to 'configure-android')
| -rwxr-xr-x | configure-android | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/configure-android b/configure-android index e9832df3..d90c5724 100755 --- a/configure-android +++ b/configure-android @@ -58,6 +58,12 @@ if test "x$TARGET_ABI" = "x"; then echo "$F: TARGET_ABI not specified, using ${TARGET_ABI}" fi +if test "$TARGET_ABI" = "x86_64" || test "$TARGET_ABI" = "mips64"; then + USR_LIB="/usr/lib64" +else + USR_LIB="/usr/lib" +fi + if test "$1" = "--use-ndk-cflags"; then shift ADD_CFLAGS="1" @@ -99,7 +105,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} -nostdlib -L${ANDROID_SYSROOT}${USR_LIB}" export LIBS="${LIBS} -lc -lgcc -ldl" export CFLAGS="${NDK_CFLAGS} ${CFLAGS}" export CPPFLAGS="${CFLAGS} -fexceptions -frtti" @@ -125,7 +131,7 @@ 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} -nostdlib -L${ANDROID_SYSROOT}${USR_LIB}" export LIBS="${LIBS} -lc -lgcc" export CFLAGS="${CFLAGS} -I${ANDROID_SYSROOT}/usr/include" export CPPFLAGS="${CFLAGS} -fexceptions -frtti" @@ -139,7 +145,7 @@ 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="${ANDROID_SYSROOT}${USR_LIB}/crtbegin_so.o -lgnustl_static" STDCPP_LDFLAGS="-L${STDCPP_TC_VER}/libs/${TARGET_ABI}/" # stlport |