diff options
| author | ruki <[email protected]> | 2020-03-27 22:46:18 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-03-27 10:37:53 +0800 |
| commit | 472d1c7a36650f113d0c9fc2f66ea2c129c1e565 (patch) | |
| tree | e683b625473d8f7ceb7507eb9ce3a8ebb3a9b843 /xmake/modules | |
| parent | cc6c658afd45b154be37382c8a99ff46748d48b3 (diff) | |
improve android abi again
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/detect/sdks/find_ndk.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/package/tools/autoconf.lua | 3 | ||||
| -rw-r--r-- | xmake/modules/private/action/trybuild/autotools.lua | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/xmake/modules/detect/sdks/find_ndk.lua b/xmake/modules/detect/sdks/find_ndk.lua index f88d54693..ae60c4dc1 100644 --- a/xmake/modules/detect/sdks/find_ndk.lua +++ b/xmake/modules/detect/sdks/find_ndk.lua @@ -108,7 +108,8 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver) , ["armeabi"] = "arm-linux-androideabi-" -- removed in ndk r17 , ["armeabi-v7a"] = "arm-linux-androideabi-" , ["arm64-v8a"] = "aarch64-linux-android-" - , i386 = "i686-linux-android-" + , i386 = "i686-linux-android-" -- deprecated + , x86 = "i686-linux-android-" , x86_64 = "x86_64-linux-android-" , mips = "mips-linux-android-" -- removed in ndk r17 , mips64 = "mips64-linux-android-" -- removed in ndk r17 @@ -124,6 +125,7 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver) , ["armeabi-v7a"] = "arm-linux-androideabi-*" , ["arm64-v8a"] = "aarch64-linux-android-*" , i386 = "x86-*" + , x86 = "x86-*" , x86_64 = "x86_64-*" , mips = "mipsel-linux-android-*" , mips64 = "mips64el-linux-android-*" diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua index c029b3d54..f67032d7c 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -50,7 +50,8 @@ function _get_configs(package, configs) ["armeabi"] = "arm-linux-androideabi", -- removed in ndk r17 ["armeabi-v7a"] = "arm-linux-androideabi", ["arm64-v8a"] = "aarch64-linux-android", - i386 = "i686-linux-android", + i386 = "i686-linux-android", -- deprecated + x86 = "i686-linux-android", x86_64 = "x86_64-linux-android", mips = "mips-linux-android", -- removed in ndk r17 mips64 = "mips64-linux-android" -- removed in ndk r17 diff --git a/xmake/modules/private/action/trybuild/autotools.lua b/xmake/modules/private/action/trybuild/autotools.lua index 54f81d18d..379007d3c 100644 --- a/xmake/modules/private/action/trybuild/autotools.lua +++ b/xmake/modules/private/action/trybuild/autotools.lua @@ -134,7 +134,8 @@ function _get_configs(artifacts_dir) ["armeabi"] = "arm-linux-androideabi", -- removed in ndk r17 ["armeabi-v7a"] = "arm-linux-androideabi", ["arm64-v8a"] = "aarch64-linux-android", - i386 = "i686-linux-android", + i386 = "i686-linux-android", -- deprecated + x86 = "i686-linux-android", x86_64 = "x86_64-linux-android", mips = "mips-linux-android", -- removed in ndk r17 mips64 = "mips64-linux-android" -- removed in ndk r17 |