Changeset 12587

Timestamp:

06/29/12 18:48:32 (13 years ago)

Author:

glperez

Message:

Minor modifications to configure script(Android).

Location:

issm/trunk-jpl

Files:

• configs/config-arm-linux.sh (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)

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

@@ -5 +5 @@
     --host="arm-linux" \
         --without-modules \
-    CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc \
-    GCC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc \
-    CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-g++ \
+    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\
-    --without-fortran-lib
+    --with-fortran="no"

issm/trunk-jpl/m4/issm_options.m4

@@ -66 +66 @@
                         export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
                 elif test $VENDOR = arm-linux; then
-                        export CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
-                        export GCC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
-                        export CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-g++
-                        export AR=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ar
-                        export RANLIB=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ranlib
+                        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!])