summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorXavier de Gaye <xdegaye@users.sourceforge.net>2016-12-10 16:34:46 (GMT)
committerXavier de Gaye <xdegaye@users.sourceforge.net>2016-12-10 16:34:46 (GMT)
commit5ca2b10213b4a5727dc99521c1b07ba75f3c321b (patch)
tree14516840feea9dc9a19753f4f49a0cd77970454e /configure
parent5c7198d46417cad8ca031b3d6a9d97c2ee6a1807 (diff)
parent32cf1acda85dd14c0865a7ce68dbc96980d6714a (diff)
downloadcpython-5ca2b10213b4a5727dc99521c1b07ba75f3c321b.zip
cpython-5ca2b10213b4a5727dc99521c1b07ba75f3c321b.tar.gz
cpython-5ca2b10213b4a5727dc99521c1b07ba75f3c321b.tar.bz2
Issue #28849: Merge 3.6.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure24
1 files changed, 1 insertions, 23 deletions
diff --git a/configure b/configure
index 8caa546..4bc92c5 100755
--- a/configure
+++ b/configure
@@ -5218,29 +5218,7 @@ cat >> conftest.c <<EOF
#undef sparc
#undef unix
#if defined(__ANDROID__)
-# if defined(__x86_64__) && defined(__LP64__)
- x86_64-linux-android
-# elif defined(__i386__)
- i686-linux-android
-# elif defined(__aarch64__) && defined(__AARCH64EL__)
-# if defined(__ILP32__)
- aarch64_ilp32-linux-android
-# else
- aarch64-linux-android
-# endif
-# elif defined(__ARM_EABI__) && defined(__ARMEL__)
- arm-linux-androideabi
-# elif defined(__mips_hard_float) && defined(_MIPSEL)
-# if _MIPS_SIM == _ABIO32
- mipsel-linux-android
-# elif _MIPS_SIM == _ABI64
- mips64el-linux-android
-# else
-# error unknown platform triplet
-# endif
-# else
-# error unknown platform triplet
-# endif
+ # Android is not a multiarch system.
#elif defined(__linux__)
# if defined(__x86_64__) && defined(__LP64__)
x86_64-linux-gnu