8000 Merge pull request #916 from brussee/boost-ndk13 · mostafahf/python-for-android@1025b2d · GitHub
[go: up one dir, main page]
Skip to content

Commit 1025b2d

Browse files
inclementinclement
authored
Merge pull request kivy#916 from brussee/boost-ndk13
Make boost recipe compatible with Google NDK 13.0
2 parents 588b2d3 + 8310328 commit 1025b2d

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

‎pythonforandroid/recipes/boost/__init__.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ def prebuild_arch(self, arch):
2020
super(BoostRecipe, self).prebuild_arch(arch)
2121
env = self.get_recipe_env(arch)
2222
with current_directory(self.get_build_dir(arch.arch)):
23-
# Make custom toolchain
24-
bash = sh.Command('bash')
25-
shprint(bash, join(self.ctx.ndk_dir, 'build/tools/make-standalone-toolchain.sh'),
26-
'--ndk-dir=' + self.ctx.ndk_dir,
27-
'--arch=' + env['ARCH'],
28-
'--platform=android-' + str(self.ctx.android_api),
29-
'--toolchain=' + env['CROSSHOST'] + '-' + env['TOOLCHAIN_VERSION'],
30-
'--install-dir=' + env['CROSSHOME']
31-
)
23+
if not exists(env['CROSSHOME']):
24+
# Make custom toolchain
25+
bash = sh.Command('bash')
26+
shprint(bash, join(self.ctx.ndk_dir, 'build/tools/make-standalone-toolchain.sh'),
27+
'--arch=' + env['ARCH'],
28+
'--platform=android-' + str(self.ctx.android_api),
29+
'--toolchain=' + env['CROSSHOST'] + '-' + env['TOOLCHAIN_VERSION'],
30+
'--install-dir=' + env['CROSSHOME']
31+
)
3232
# Set custom configuration
3333
shutil.copyfile(join(self.get_recipe_dir(), 'user-config.jam'),
3434
join(env['BOOST_BUILD_PATH'], 'user-config.jam'))

0 commit comments

Comments
 (0)
0