Changeset 5126

Timestamp:

Jul 6, 2015 7:33:40 AM (9 years ago)

Author:

riza

Message:

Misc (re #1843): Modify configure-android to support x86_64 and mips64 target.

File:

• pjproject/trunk/configure-android (modified) (4 diffs)

pjproject/trunk/configure-android

@@ -59 +59 @@
 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
@@ -100 +106 @@
   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}"
@@ -126 +132 @@
   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"
@@ -140 +146 @@
 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}/"