Skip to content

Commit

Permalink
Clean-up LDSHARED, fixes kivy#1360
Browse files Browse the repository at this point in the history
Since kivy#1361 was merged, we can drop LDSHARED override.
  • Loading branch information
AndreMiras committed Jan 29, 2019
1 parent 3cc0657 commit 0c67e6a
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
6 changes: 0 additions & 6 deletions pythonforandroid/recipes/pycryptodome/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,5 @@ class PycryptodomeRecipe(PythonRecipe):
url = 'https://github.com/Legrandin/pycryptodome/archive/v{version}.tar.gz'
depends = ['setuptools', 'cffi']

def get_recipe_env(self, arch=None, with_flags_in_cc=True):
env = super(PycryptodomeRecipe, self).get_recipe_env(arch, with_flags_in_cc)
# sets linker to use the correct gcc (cross compiler)
env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
return env


recipe = PycryptodomeRecipe()
2 changes: 0 additions & 2 deletions pythonforandroid/recipes/pyleveldb/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ def get_recipe_env(self, arch):
env = super(PyLevelDBRecipe, self).get_recipe_env(arch)
# Copy environment from leveldb recipe
env.update(self.get_recipe('leveldb', self.ctx).get_recipe_env(arch))
# Set linker to use the correct gcc
env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
env['LDFLAGS'] += ' -lleveldb'
return env

Expand Down
2 changes: 0 additions & 2 deletions pythonforandroid/recipes/secp256k1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ class Secp256k1Recipe(PythonRecipe):

def get_recipe_env(self, arch=None, with_flags_in_cc=True):
env = super(Secp256k1Recipe, self).get_recipe_env(arch, with_flags_in_cc)
# sets linker to use the correct gcc (cross compiler)
env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
libsecp256k1 = self.get_recipe('libsecp256k1', self.ctx)
libsecp256k1_dir = libsecp256k1.get_build_dir(arch.arch)
env['LDFLAGS'] += ' -L{}'.format(libsecp256k1_dir)
Expand Down

0 comments on commit 0c67e6a

Please sign in to comment.