Changeset 12599

Timestamp:

07/02/12 16:27:06 (13 years ago)

Author:

glperez

Message:

Removed Android-specific vendor options.

Location:

issm/trunk-jpl

Files:

• configs/config-arm-linux.sh (modified) (1 diff)
• externalpackages/android/android-ndk/install.sh (modified) (1 diff)
• externalpackages/android/android_variables.sh (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)

issm/trunk-jpl/configs/config-arm-linux.sh

@@ -3 +3 @@
 ./configure \
         --prefix=$ISSM_DIR \
-    --host="arm-linux" \
+    --build="i386-apple-darwin10.8.0" \
+    --host="arm-linux-androideabi" \
+    --without-fortran \
         --without-modules \
-    CC=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-gcc \
-    GCC=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-gcc \
-    CXX=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-g++ \
-        --with-vendor=arm-linux \
-        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-        --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install\
-    --with-fortran="no"
+        --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
+        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install 

issm/trunk-jpl/externalpackages/android/android-ndk/install.sh

@@ -25 +25 @@
 #Note: API-14 corresponds to Android 4.0 although we are
 #calling our toolchain 4.1 to agree with our device.
-$ANDROID_NDK_DIR/build/tools/make-standalone-toolchain.sh --platform=android-14 --install-dir=$ANDROID_DIR/arm-linux-${default_droid}
+$ANDROID_NDK_DIR/build/tools/make-standalone-toolchain.sh --platform=android-14 --install-dir=$ANDROID_DIR/arm-linux-android-4.0

issm/trunk-jpl/externalpackages/android/android_variables.sh

@@ -2 +2 @@
 ndk_rev=8
 api_levels="android-14,android-15,android-16"
+host_triplet=""
 default_droid="android-4.1"
 toolchain_path=${ANDROID_DIR}"/arm-linux-"${default_droid}"/bin/arm-linux-androideabi"

issm/trunk-jpl/m4/issm_options.m4

@@ -65 +65 @@
                         export CXXFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
                         export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
-                elif test $VENDOR = arm-linux; then
-                        export CC=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-gcc
-                        export GCC=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-gcc
-                        export CXX=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-g++
-                        export AR=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-ar
-                        export RANLIB=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-ranlib
         else
                 AC_MSG_ERROR([unknow compiler vendor!])