8000 Move libraries from LDFLAGS to LIBS for pycrypto recipe · kivy/python-for-android@de4c4c5 · GitHub
[go: up one dir, main page]

Skip to content

Commit de4c4c5

Browse files
committed
Move libraries from LDFLAGS to LIBS for pycrypto recipe
Because this is how you are supposed to do it, you must use LDFLAGS for linker flags and LDLIBS (or the equivalent LOADLIBES) for the libraries
1 parent d49346b commit de4c4c5

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

pythonforandroid/recipes/pycrypto/__init__.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ def get_recipe_env(self, arch=None, clang=True):
2020
openssl_recipe = Recipe.get_recipe('openssl', self.ctx)
2121
env['CC'] = env['CC'] + openssl_recipe.include_flags(arch)
2222

23-
env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format(
24-
self.ctx.get_libs_dir(arch.arch) +
25-
'-L{}'.format(self.ctx.libs_dir)) + openssl_recipe.link_flags(arch)
23+
env['LDFLAGS'] += ' -L{}'.format(self.ctx.get_libs_dir(arch.arch))
24+
env['LDFLAGS'] += ' -L{}'.format(self.ctx.libs_dir)
25+
env['LDFLAGS'] += openssl_recipe.link_dirs_flags(arch)
26+
env['LIBS'] = env.get('LIBS', '') + openssl_recipe.link_libs_flags()
2627

2728
env['EXTRA_CFLAGS'] = '--host linux-armv'
2829
env['ac_cv_func_malloc_0_nonnull'] = 'yes'

0 commit comments

Comments
 (0)
0