Changeset 12172

Timestamp:

05/02/12 12:08:56 (13 years ago)

Author:

glperez

Message:

Modifified ISSM_options.m4 and arm-linux-android-4.0 to better fit cross-compiling needs

Location:

issm/trunk-jpl

Files:

• configs/config-arm-linux.sh (modified) (1 diff)
• externalpackages/python/install.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" \
         --without-modules \
         --with-vendor=arm-linux \

issm/trunk-jpl/externalpackages/python/install.sh

@@ -2 +2 @@
 #wget http://python.org/ftp/python/version/Python-version.tgz
 
-version=3.2.2
-#version=2.7.2
+#version=3.2.2
+version=2.7.2
 
 #Some cleanup

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-cc
-                        export CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-cc
-
-                else
+                        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
+        else
                 AC_MSG_ERROR([unknow compiler vendor!])
                 fi