Changeset 12587


Ignore:
Timestamp:
06/29/12 18:48:32 (13 years ago)
Author:
glperez
Message:

Minor modifications to configure script(Android).

Location:
issm/trunk-jpl
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/configs/config-arm-linux.sh

    r12227 r12587  
    55    --host="arm-linux" \
    66        --without-modules \
    7     CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc \
    8     GCC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc \
    9     CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-g++ \
     7    CC=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-gcc \
     8    GCC=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-gcc \
     9    CXX=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-g++ \
    1010        --with-vendor=arm-linux \
    1111        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
    1212        --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install\
    13     --without-fortran-lib
     13    --with-fortran="no"
  • issm/trunk-jpl/m4/issm_options.m4

    r12585 r12587  
    6666                        export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
    6767                elif test $VENDOR = arm-linux; then
    68                         export CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
    69                         export GCC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
    70                         export CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-g++
    71                         export AR=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ar
    72                         export RANLIB=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ranlib
     68                        export CC=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-gcc
     69                        export GCC=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-gcc
     70                        export CXX=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-g++
     71                        export AR=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-ar
     72                        export RANLIB=$ANDROID_DIR/arm-linux-android-4.1/bin/arm-linux-androideabi-ranlib
    7373        else
    7474                AC_MSG_ERROR([unknow compiler vendor!])
Note: See TracChangeset for help on using the changeset viewer.