summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xConfigure1
-rw-r--r--hints/linux-android.sh10
2 files changed, 11 insertions, 0 deletions
diff --git a/Configure b/Configure
index a9bec78379..71fa2d2ae2 100755
--- a/Configure
+++ b/Configure
@@ -3391,6 +3391,7 @@ EOM
case "$3" in
*) osvers="$3" ;;
esac
+ $test -f /system/lib/libandroid.so && osname=linux-android
;;
MiNT) osname=mint
;;
diff --git a/hints/linux-android.sh b/hints/linux-android.sh
index 58be2012c3..ae031cbd27 100644
--- a/hints/linux-android.sh
+++ b/hints/linux-android.sh
@@ -20,6 +20,12 @@ d_libname_unique='define'
# On Android the shell is /system/bin/sh:
targetsh='/system/bin/sh'
+case "$usecrosscompile" in
+define) ;;
+ # If we aren't cross-compiling, then sh should also point
+ # to /system/bin/sh.
+*) sh=$targetsh ;;
+esac
# Make sure that we look for libm
libswanted="$libswanted m"
@@ -244,9 +250,13 @@ $chmod a+rx $from
fi # Cross-compiling with adb
+case "$usecrosscompile" in
+define)
if $test "X$hostosname" = "Xdarwin"; then
firstmakefile=GNUmakefile;
fi
+;;
+esac
osvers="`$run getprop ro.build.version.release`"