supply arch.arch to get_python_install_dir()
This commit is contained in:
parent
2926957670
commit
717d3805b2
2 changed files with 2 additions and 2 deletions
|
@ -18,7 +18,7 @@ class LbryBootstrap(Bootstrap):
|
||||||
info_main("# Creating Android project ({})".format(self.name))
|
info_main("# Creating Android project ({})".format(self.name))
|
||||||
|
|
||||||
arch = self.ctx.archs[0]
|
arch = self.ctx.archs[0]
|
||||||
python_install_dir = self.ctx.get_python_install_dir()
|
python_install_dir = self.ctx.get_python_install_dir(arch.arch)
|
||||||
#from_crystax = self.ctx.python_recipe.from_crystax
|
#from_crystax = self.ctx.python_recipe.from_crystax
|
||||||
#crystax_python_dir = join("crystax_python", "crystax_python")
|
#crystax_python_dir = join("crystax_python", "crystax_python")
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ class CoincurveRecipe(CompiledComponentsPythonRecipe):
|
||||||
# https://github.com/kivy/python-for-android/pull/1250/files#diff-569e13021e33ced8b54385f55b49cbe6
|
# https://github.com/kivy/python-for-android/pull/1250/files#diff-569e13021e33ced8b54385f55b49cbe6
|
||||||
env['CFLAGS'] += ' -I{}/include/python/'.format(ndk_dir_python)
|
env['CFLAGS'] += ' -I{}/include/python/'.format(ndk_dir_python)
|
||||||
else:
|
else:
|
||||||
env['PYTHON_ROOT'] = self.ctx.get_python_install_dir()
|
env['PYTHON_ROOT'] = self.ctx.get_python_install_dir(arch.arch)
|
||||||
env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/include/python{}'.format(python_version)
|
env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/include/python{}'.format(python_version)
|
||||||
env['LDFLAGS'] += " -lpython{}".format(python_version)
|
env['LDFLAGS'] += " -lpython{}".format(python_version)
|
||||||
env['LDFLAGS'] += " -lsecp256k1"
|
env['LDFLAGS'] += " -lsecp256k1"
|
||||||
|
|
Loading…
Reference in a new issue