Remove clang of get_recipe_env

Because as per ndk r19 the default compiler is clang and gcc has been partially removed

Author: opacam

pythonforandroid/archs.py

@@ -46,7 +46,7 @@ def target(self):
         return '{triplet}{ndk_api}'.format(
                 triplet=self.command_prefix, ndk_api=self.ctx.ndk_api)
 
-    def get_env(self, with_flags_in_cc=True, clang=False):
+    def get_env(self, with_flags_in_cc=True):
         env = {}
 
         # CFLAGS and CXXFLAGS
@@ -185,8 +185,8 @@ def target(self):
 class ArchARMv7_a(ArchARM):
     arch = 'armeabi-v7a'
 
-    def get_env(self, with_flags_in_cc=True, clang=False):
-        env = super(ArchARMv7_a, self).get_env(with_flags_in_cc, clang=clang)
+    def get_env(self, with_flags_in_cc=True):
+        env = super(ArchARMv7_a, self).get_env(with_flags_in_cc)
         env['CFLAGS'] = (env['CFLAGS'] +
                          (' -march=armv7-a -mfloat-abi=softfp '
                           '-mfpu=vfp -mthumb'))
@@ -200,8 +200,8 @@ class Archx86(Arch):
     command_prefix = 'i686-linux-android'
     platform_dir = 'arch-x86'
 
-    def get_env(self, with_flags_in_cc=True, clang=False):
-        env = super(Archx86, self).get_env(with_flags_in_cc, clang=clang)
+    def get_env(self, with_flags_in_cc=True):
+        env = super(Archx86, self).get_env(with_flags_in_cc)
         env['CFLAGS'] = (env['CFLAGS'] +
                          ' -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32')
         env['CXXFLAGS'] = env['CFLAGS']
@@ -214,8 +214,8 @@ class Archx86_64(Arch):
     command_prefix = 'x86_64-linux-android'
     platform_dir = 'arch-x86_64'
 
-    def get_env(self, with_flags_in_cc=True, clang=False):
-        env = super(Archx86_64, self).get_env(with_flags_in_cc, clang=clang)
+    def get_env(self, with_flags_in_cc=True):
+        env = super(Archx86_64, self).get_env(with_flags_in_cc)
         env['CFLAGS'] = (env['CFLAGS'] +
                          ' -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel')
         env['CXXFLAGS'] = env['CFLAGS']
@@ -228,8 +228,8 @@ class ArchAarch_64(Arch):
     command_prefix = 'aarch64-linux-android'
     platform_dir = 'arch-arm64'
 
-    def get_env(self, with_flags_in_cc=True, clang=False):
-        env = super(ArchAarch_64, self).get_env(with_flags_in_cc, clang=clang)
+    def get_env(self, with_flags_in_cc=True):
+        env = super(ArchAarch_64, self).get_env(with_flags_in_cc)
         incpath = ' -I' + join(dirname(__file__), 'includes', 'arm64-v8a')
         env['EXTRA_CFLAGS'] = incpath
         env['CFLAGS'] += incpath

pythonforandroid/recipe.py

@@ -425,12 +425,12 @@ def unpack(self, arch):
             else:
                 info('{} is already unpacked, skipping'.format(self.name))
 
-    def get_recipe_env(self, arch=None, with_flags_in_cc=True, clang=False):
+    def get_recipe_env(self, arch=None, with_flags_in_cc=True):
         """Return the env specialized for the recipe
         """
         if arch is None:
             arch = self.filtered_archs[0]
-        return arch.get_env(with_flags_in_cc=with_flags_in_cc, clang=clang)
+        return arch.get_env(with_flags_in_cc=with_flags_in_cc)
 
     def prebuild_arch(self, arch):
         '''Run any pre-build tasks for the Recipe. By default, this checks if

pythonforandroid/recipes/jpeg/__init__.py

@@ -63,7 +63,7 @@ def build_arch(self, arch):
             for lib in glob(join(build_dir, '*.a')):
                 shprint(sh.cp, '-L', lib, self.ctx.libs_dir)
 
-    def get_recipe_env(self, arch=None, with_flags_in_cc=False, clang=True):
+    def get_recipe_env(self, arch=None, with_flags_in_cc=False):
         env = environ.copy()
 
         build_platform = '{system}-{machine}'.format(

pythonforandroid/recipes/openssl/__init__.py

@@ -114,7 +114,7 @@ def should_build(self, arch):
                                  'libcrypto' + self.version + '.so')
 
     def get_recipe_env(self, arch=None):
-        env = super(OpenSSLRecipe, self).get_recipe_env(arch, clang=not self.use_legacy)
+        env = super(OpenSSLRecipe, self).get_recipe_env(arch)
         env['OPENSSL_VERSION'] = self.version
         env['MAKE'] = 'make'  # This removes the '-j5', which isn't safe
         if self.use_legacy:

pythonforandroid/recipes/pycrypto/__init__.py

@@ -15,7 +15,7 @@ class PyCryptoRecipe(CompiledComponentsPythonRecipe):
     call_hostpython_via_targetpython = False
     patches = ['add_length.patch']
 
-    def get_recipe_env(self, arch=None, clang=True):
+    def get_recipe_env(self, arch=None):
         env = super(PyCryptoRecipe, self).get_recipe_env(arch)
         openssl_recipe = Recipe.get_recipe('openssl', self.ctx)
         env['CC'] = env['CC'] + openssl_recipe.include_flags(arch)