Merge pull request kivy#704 from brussee/fix-from_crystax

inclement · inclement · commit 3e5c2a0a06ee · 2016-05-07T22:13:14.000+01:00
Fix python_recipe.from_crystax
diff --git a/pythonforandroid/archs.py b/pythonforandroid/archs.py
@@ -111,7 +111,7 @@ def get_env(self, with_flags_in_cc=True):
 
         env['ARCH'] = self.arch
 
-        if self.ctx.python_recipe.from_crystax:
+        if self.ctx.python_recipe and self.ctx.python_recipe.from_crystax:
             env['CRYSTAX_PYTHON_VERSION'] = self.ctx.python_recipe.version
 
         return env
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -564,7 +564,7 @@ def build_recipes(build_order, python_modules, ctx):
         # 4) biglink everything
         # AND: Should make this optional
         info_main('# Biglinking object files')
-        if not ctx.python_recipe.from_crystax:
+        if not ctx.python_recipe or not ctx.python_recipe.from_crystax:
             biglink(ctx, arch)
         else:
             info('NDK is crystax, skipping biglink (will this work?)')
