From 36516ddb47e6e0a244073208cdbbd1aeaf20d02e Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 9 Oct 2019 05:52:13 +0300 Subject: [PATCH] waifulib: xcompile: fix aarch64 binary installation --- scripts/waifulib/xcompile.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/waifulib/xcompile.py b/scripts/waifulib/xcompile.py index 98516ce8..fe9b0e27 100644 --- a/scripts/waifulib/xcompile.py +++ b/scripts/waifulib/xcompile.py @@ -144,6 +144,11 @@ class Android: else: return self.arch + '-linux-android' + def apk_arch(self): + if self.is_arm64(): + return 'arm64-v8a' + return self.arch + def gen_host_toolchain(self): # With host toolchain we don't care about OS # so just download NDK for Linux x86_64 @@ -336,7 +341,7 @@ def configure(conf): conf.env.LIB_M = ['m_hard'] else: conf.env.LIB_M = ['m'] - conf.env.PREFIX = '/lib/%s' % (android.arch) + conf.env.PREFIX = '/lib/%s' % android.apk_arch() conf.msg('Selected Android NDK', '%s, version: %d' % (android.ndk_home, android.ndk_rev)) # no need to print C/C++ compiler, as it would be printed by compiler_c/cxx