- Issue #27917: Set platform triplets for Android builds.
This commit is contained in:
parent
af0628e045
commit
5c38cb2316
|
@ -127,6 +127,8 @@ Tests
|
||||||
Build
|
Build
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
- Issue #27917: Set platform triplets for Android builds.
|
||||||
|
|
||||||
- Issue #25825: Update references to the $(LIBPL) installation path on AIX.
|
- Issue #25825: Update references to the $(LIBPL) installation path on AIX.
|
||||||
This path was changed in 3.2a4.
|
This path was changed in 3.2a4.
|
||||||
|
|
||||||
|
|
|
@ -5279,7 +5279,31 @@ cat >> conftest.c <<EOF
|
||||||
#undef powerpc
|
#undef powerpc
|
||||||
#undef sparc
|
#undef sparc
|
||||||
#undef unix
|
#undef unix
|
||||||
#if defined(__linux__)
|
#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
|
||||||
|
#elif defined(__linux__)
|
||||||
# if defined(__x86_64__) && defined(__LP64__)
|
# if defined(__x86_64__) && defined(__LP64__)
|
||||||
x86_64-linux-gnu
|
x86_64-linux-gnu
|
||||||
# elif defined(__x86_64__) && defined(__ILP32__)
|
# elif defined(__x86_64__) && defined(__ILP32__)
|
||||||
|
|
26
configure.ac
26
configure.ac
|
@ -768,7 +768,31 @@ cat >> conftest.c <<EOF
|
||||||
#undef powerpc
|
#undef powerpc
|
||||||
#undef sparc
|
#undef sparc
|
||||||
#undef unix
|
#undef unix
|
||||||
#if defined(__linux__)
|
#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
|
||||||
|
#elif defined(__linux__)
|
||||||
# if defined(__x86_64__) && defined(__LP64__)
|
# if defined(__x86_64__) && defined(__LP64__)
|
||||||
x86_64-linux-gnu
|
x86_64-linux-gnu
|
||||||
# elif defined(__x86_64__) && defined(__ILP32__)
|
# elif defined(__x86_64__) && defined(__ILP32__)
|
||||||
|
|
Loading…
Reference in New Issue