@@ -67,14 +67,20 @@ def build_arch(self, arch):
67
67
env = environ .copy ()
68
68
69
69
# TODO: Get this information from p4a's arch system
70
- android_host = 'arm-linux-androideabi'
70
+ android_host = arch . toolchain_prefix
71
71
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 )
73
73
toolchain = '{android_host}-4.9' .format (android_host = android_host )
74
74
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
+
75
81
CC = '{clang} -target {target} -gcc-toolchain {toolchain}' .format (
76
82
clang = join (self .ctx .ndk_dir , 'toolchains' , 'llvm' , 'prebuilt' , 'linux-x86_64' , 'bin' , 'clang' ),
77
- target = 'armv7-none-linux-androideabi' ,
83
+ target = target ,
78
84
toolchain = toolchain )
79
85
80
86
AR = join (toolchain , 'bin' , android_host ) + '-ar'
0 commit comments