Skip to content

Commit 547ee18

Browse files
Get Arch from P4A
1 parent 7b16f24 commit 547ee18

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

pythonforandroid/recipes/python3/__init__.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,20 @@ def build_arch(self, arch):
6767
env = environ.copy()
6868

6969
# TODO: Get this information from p4a's arch system
70-
android_host = 'arm-linux-androideabi'
70+
android_host = arch.toolchain_prefix
7171
android_build = sh.Command(join(recipe_build_dir, 'config.guess'))().stdout.strip().decode('utf-8')
72-
platform_dir = join(self.ctx.ndk_dir, 'platforms', platform_name, 'arch-arm')
72+
platform_dir = join(self.ctx.ndk_dir, 'platforms', platform_name, arch.platform_dir)
7373
toolchain = '{android_host}-4.9'.format(android_host=android_host)
7474
toolchain = join(self.ctx.ndk_dir, 'toolchains', toolchain, 'prebuilt', 'linux-x86_64')
75+
76+
target_data = arch.command_prefix.split('-')
77+
if targetData[0] == 'arm':
78+
targetData[0] = 'armv7a'
79+
target = '-'.join([targetData[0], 'none', targetData[1], targetData[2]])
80+
7581
CC = '{clang} -target {target} -gcc-toolchain {toolchain}'.format(
7682
clang=join(self.ctx.ndk_dir, 'toolchains', 'llvm', 'prebuilt', 'linux-x86_64', 'bin', 'clang'),
77-
target='armv7-none-linux-androideabi',
83+
target=target,
7884
toolchain=toolchain)
7985

8086
AR = join(toolchain, 'bin', android_host) + '-ar'

0 commit comments

Comments
 (0)