Fix build platform hardcoded flags for archs.py

opacam · opacam · commit f570def71861 · 2019-01-16T12:09:10.000+01:00
diff --git a/pythonforandroid/archs.py b/pythonforandroid/archs.py
@@ -5,7 +5,7 @@
 from distutils.spawn import find_executable
 
 from pythonforandroid.recipe import Recipe
-from pythonforandroid.util import BuildInterruptingException
+from pythonforandroid.util import BuildInterruptingException, build_platform
 
 
 class Arch(object):
@@ -51,7 +51,8 @@ def get_env(self, with_flags_in_cc=True, clang=False):
             toolchain = '{android_host}-{toolchain_version}'.format(
                 android_host=self.ctx.toolchain_prefix,
                 toolchain_version=self.ctx.toolchain_version)
-            toolchain = join(self.ctx.ndk_dir, 'toolchains', toolchain, 'prebuilt', 'linux-x86_64')
+            toolchain = join(self.ctx.ndk_dir, 'toolchains', toolchain,
+                             'prebuilt', build_platform)
             cflags.append('-gcc-toolchain {}'.format(toolchain))
 
         env['CFLAGS'] = ' '.join(cflags)
@@ -106,7 +107,7 @@ def get_env(self, with_flags_in_cc=True, clang=False):
             llvm_dirname = split(
                 glob(join(self.ctx.ndk_dir, 'toolchains', 'llvm*'))[-1])[-1]
             clang_path = join(self.ctx.ndk_dir, 'toolchains', llvm_dirname,
-                              'prebuilt', 'linux-x86_64', 'bin')
+                              'prebuilt', build_platform, 'bin')
             environ['PATH'] = '{clang_path}:{path}'.format(
                 clang_path=clang_path, path=environ['PATH'])
             exe = join(clang_path, 'clang')
