summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdouard Oger <eoger@fastmail.com>2019-05-07 09:03:46 -0700
committerEdouard Oger <eoger@fastmail.com>2019-05-07 09:03:46 -0700
commit5c75142018b9ab56791fc84de338208d8489be09 (patch)
treeb0d1727e20acd73016db6d4d8302ae49a6aa3bec
parentc138f0294f927c24840a9f554c3bd7ee02cb6d33 (diff)
downloadnspr-hg-5c75142018b9ab56791fc84de338208d8489be09.tar.gz
Bug 1549416 - Use correct android tool prefix on 64 bits targets. r=glandium
-rwxr-xr-xconfigure6
-rw-r--r--configure.in6
2 files changed, 12 insertions, 0 deletions
diff --git a/configure b/configure
index 782776d1..b5bc5976 100755
--- a/configure
+++ b/configure
@@ -2641,6 +2641,12 @@ fi
case "$target" in
+x86_64-linux*-android*)
+ android_tool_prefix="x86_64-linux-android"
+ ;;
+aarch64-linux*-android*)
+ android_tool_prefix="aarch64-linux-android"
+ ;;
arm-linux*-android*|*-linuxandroid*)
android_tool_prefix="arm-linux-androideabi"
;;
diff --git a/configure.in b/configure.in
index 72ed5d0a..6f505ba4 100644
--- a/configure.in
+++ b/configure.in
@@ -133,6 +133,12 @@ AC_ARG_WITH(android-platform,
android_platform=$withval)
case "$target" in
+x86_64-linux*-android*)
+ android_tool_prefix="x86_64-linux-android"
+ ;;
+aarch64-linux*-android*)
+ android_tool_prefix="aarch64-linux-android"
+ ;;
arm-linux*-android*|*-linuxandroid*)
android_tool_prefix="arm-linux-androideabi"
;;