summaryrefslogtreecommitdiff
path: root/tools/configure
diff options
context:
space:
mode:
Diffstat (limited to 'tools/configure')
-rwxr-xr-xtools/configure6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/configure b/tools/configure
index 73a8cae42d..5b3419d771 100755
--- a/tools/configure
+++ b/tools/configure
@@ -673,11 +673,11 @@ androidcc () {
673 LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared -ldl -llog" 673 LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared -ldl -llog"
674 GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack -shared" 674 GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack -shared"
675 ANDROID_ARCH=$1 # for android.make too 675 ANDROID_ARCH=$1 # for android.make too
676 gccchoice="4.6"
676 # arch dependant stuff 677 # arch dependant stuff
677 case $ANDROID_ARCH in 678 case $ANDROID_ARCH in
678 armeabi) 679 armeabi)
679 endian="little" 680 endian="little"
680 gccchoice="4.4.3"
681 gcctarget="arm-linux-androideabi-" 681 gcctarget="arm-linux-androideabi-"
682 # sigaltstack is not available in pre-android-9, however asm 682 # sigaltstack is not available in pre-android-9, however asm
683 # threads work fine so far 683 # threads work fine so far
@@ -688,7 +688,6 @@ androidcc () {
688 ;; 688 ;;
689 mips) 689 mips)
690 endian="little" 690 endian="little"
691 gccchoice="4.4.3"
692 gcctarget="mipsel-linux-android-" 691 gcctarget="mipsel-linux-android-"
693 thread_support="HAVE_SIGALTSTACK_THREADS" 692 thread_support="HAVE_SIGALTSTACK_THREADS"
694 GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \ 693 GCCOPTS="$GCCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -fomit-frame-pointer \
@@ -696,8 +695,7 @@ androidcc () {
696 LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips" 695 LDOPTS="$LDOPTS --sysroot=$ANDROID_NDK_PATH/platforms/android-14/arch-mips"
697 ;; 696 ;;
698 x86) 697 x86)
699 endian=little 698 endian="little"
700 gccchoice="4.4.3"
701 gcctarget="i686-linux-android-" 699 gcctarget="i686-linux-android-"
702 gccdir=x86-$gccchoice 700 gccdir=x86-$gccchoice
703 thread_support="HAVE_SIGALTSTACK_THREADS" 701 thread_support="HAVE_SIGALTSTACK_THREADS"