Changeset 13986

Timestamp:

Nov 19, 2012, 3:45:12 PM (14 years ago)

Author:

glperez

Message:

BUG: Fixed issue with Triangle cross-compile for Android.

Location:

issm/trunk-jpl/externalpackages/triangle

Files:

• configs/android/configure.make (modified) (1 diff)
• install-android.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/triangle/configs/android/configure.make

@@ -10 +10 @@
 # http://www.codesourcery.com/gnu_toolchains/arm/arm_gnu_linux_abi.pdf
 
-source $ANDROID_DIR/android_aux.sh
-
-CC=${toolchain_path}-gcc
-AR=${toolchain_path}-ar
-RANLIB=${toolchain_path}-ranlib
+CC=${host_triplet}-gcc
+AR=${host_triplet}-ar
+RANLIB=${host_triplet}-ranlib
 CSWITCHES = $(CFLAGS)
 TRILIBDEFS = -DTRILIBRARY

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

@@ -1 +1 @@
 #!/bin/bash
 set -eu
+
+source $ANDROID_DIR/android_aux.sh
 
 #Some cleanup