Skip to content

Commit 6749b9c

Browse files
committed
Fix wrong python2 configure argument for openssl
1 parent b8b8aba commit 6749b9c

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

pythonforandroid/python.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,6 @@ def add_flags(include_flags, link_flags):
194194
info('Activating flags for openssl')
195195
recipe = Recipe.get_recipe('openssl', self.ctx)
196196
add_flags(recipe.include_flags(arch), recipe.link_flags(arch))
197-
self.configure_args += \
198-
('--with-openssl=' + recipe.get_build_dir(arch.arch),)
199197
return env
200198

201199
def get_recipe_env(self, arch=None, with_flags_in_cc=True):

pythonforandroid/recipes/python3/__init__.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,12 @@ class Python3Recipe(GuestPythonRecipe):
3838
'--prefix={prefix}',
3939
'--exec-prefix={exec_prefix}')
4040

41+
def set_libs_flags(self, env, arch):
42+
env = super(Python3Recipe, self).set_libs_flags(env, arch)
43+
if 'openssl' in self.ctx.recipe_build_order:
44+
self.configure_args += \
45+
('--with-openssl=' + recipe.get_build_dir(arch.arch),)
46+
return env
47+
4148

4249
recipe = Python3Recipe()

0 commit comments

Comments
 (0)