source: issm/oecreview/Archive/13977-14063/ISSM-13985-13986.diff@ 14064

Last change on this file since 14064 was 14064, checked in by Mathieu Morlighem, 13 years ago

Added Archive/13977-14063
File size: 1.1 KB
RevLine 
[14064]1Index: ../trunk-jpl/externalpackages/triangle/configs/android/configure.make
2===================================================================
3--- ../trunk-jpl/externalpackages/triangle/configs/android/configure.make (revision 13985)
4+++ ../trunk-jpl/externalpackages/triangle/configs/android/configure.make (revision 13986)
5@@ -9,11 +9,9 @@
6 #
7 # http://www.codesourcery.com/gnu_toolchains/arm/arm_gnu_linux_abi.pdf
8
9-source $ANDROID_DIR/android_aux.sh
10-
11-CC=${toolchain_path}-gcc
12-AR=${toolchain_path}-ar
13-RANLIB=${toolchain_path}-ranlib
14+CC=${host_triplet}-gcc
15+AR=${host_triplet}-ar
16+RANLIB=${host_triplet}-ranlib
17 CSWITCHES = $(CFLAGS)
18 TRILIBDEFS = -DTRILIBRARY
19 OBJ_EXT=o
20Index: ../trunk-jpl/externalpackages/triangle/install-android.sh
21===================================================================
22--- ../trunk-jpl/externalpackages/triangle/install-android.sh (revision 13985)
23+++ ../trunk-jpl/externalpackages/triangle/install-android.sh (revision 13986)
24@@ -1,6 +1,8 @@
25 #!/bin/bash
26 set -eu
27
28+source $ANDROID_DIR/android_aux.sh
29+
30 #Some cleanup
31 rm -rf install triangle
32 mkdir install
Note: See TracBrowser for help on using the repository browser.