Skip to content

Commit d3462f4

Browse files
committed
Changed some crystax checks to check python recipe
1 parent 5bd8eac commit d3462f4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pythonforandroid/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ def get_site_packages_dir(self, arch=None):
470470
# AND: This *must* be replaced with something more general in
471471
# order to support multiple python versions and/or multiple
472472
# archs.
473-
if self.ndk_is_crystax:
473+
if self.python_recipe.from_crystax:
474474
return self.get_python_install_dir()
475475
return join(self.get_python_install_dir(),
476476
'lib', 'python2.7', 'site-packages')

pythonforandroid/recipe.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -785,8 +785,8 @@ def build_cython_components(self, arch):
785785

786786
env = self.get_recipe_env(arch)
787787

788-
if self.ctx.ndk_is_crystax:
789-
site_packages_dirs = sh.Command('python3.5')('-c', 'import site; print("\\n".join(site.getsitepackages()))').stdout.split('\n')
788+
if self.ctx.python_recipe.from_crystax:
789+
site_packages_dirs = sh.Command('python{}'.format(self.ctx.python_recipe.version)('-c', 'import site; print("\\n".join(site.getsitepackages()))').stdout.split('\n')
790790
# env['PYTHONPATH'] = '/usr/lib/python3.5/site-packages/:/usr/lib/python3.5'
791791
if 'PYTHONPATH' in env:
792792
env['PYTHONPATH'] = env + ':{}'.format(':'.join(site_packages_dirs))

0 commit comments

Comments
 (0)