Fixed Arch use of command_prefix

inclement · inclement · commit 89f9fc3564f9 · 2015-12-11T00:09:07.000Z
diff --git a/pythonforandroid/archs.py b/pythonforandroid/archs.py
@@ -47,35 +47,34 @@ def get_env(self):
 
         toolchain_prefix = self.ctx.toolchain_prefix
         toolchain_version = self.ctx.toolchain_version
+        command_prefix = self.command_prefix
 
         env['TOOLCHAIN_PREFIX'] = toolchain_prefix
         env['TOOLCHAIN_VERSION'] = toolchain_version
 
-        if toolchain_prefix == 'x86':
-            toolchain_prefix = 'i686-linux-android'
         print('path is', environ['PATH'])
-        cc = find_executable('{toolchain_prefix}-gcc'.format(
-            toolchain_prefix=toolchain_prefix), path=environ['PATH'])
+        cc = find_executable('{command_prefix}-gcc'.format(
+            command_prefix=command_prefix), path=environ['PATH'])
         if cc is None:
             warning('Couldn\'t find executable for CC. This indicates a '
                     'problem locating the {} executable in the Android '
                     'NDK, not that you don\'t have a normal compiler '
                     'installed. Exiting.')
             exit(1)
 
-        env['CC'] = '{toolchain_prefix}-gcc {cflags}'.format(
-            toolchain_prefix=toolchain_prefix,
+        env['CC'] = '{command_prefix}-gcc {cflags}'.format(
+            command_prefix=command_prefix,
             cflags=env['CFLAGS'])
-        env['CXX'] = '{toolchain_prefix}-g++ {cxxflags}'.format(
-            toolchain_prefix=toolchain_prefix,
+        env['CXX'] = '{command_prefix}-g++ {cxxflags}'.format(
+            command_prefix=command_prefix,
             cxxflags=env['CXXFLAGS'])
 
-        env['AR'] = '{}-ar'.format(toolchain_prefix)
-        env['RANLIB'] = '{}-ranlib'.format(toolchain_prefix)
-        env['LD'] = '{}-ld'.format(toolchain_prefix)
-        env['STRIP'] = '{}-strip --strip-unneeded'.format(toolchain_prefix)
+        env['AR'] = '{}-ar'.format(command_prefix)
+        env['RANLIB'] = '{}-ranlib'.format(command_prefix)
+        env['LD'] = '{}-ld'.format(command_prefix)
+        env['STRIP'] = '{}-strip --strip-unneeded'.format(command_prefix)
         env['MAKE'] = 'make -j5'
-        env['READELF'] = '{}-readelf'.format(toolchain_prefix)
+        env['READELF'] = '{}-readelf'.format(command_prefix)
 
         hostpython_recipe = Recipe.get_recipe('hostpython2', self.ctx)
 
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -573,7 +573,6 @@ def prepare_build_environment(self, user_sdk_dir, user_ndk_dir,
         arch = self.archs[0]
         platform_dir = arch.platform_dir
         toolchain_prefix = arch.toolchain_prefix
-        command_prefix = arch.command_prefix
         self.ndk_platform = join(
             self.ndk_dir,
             'platforms',
