summaryrefslogtreecommitdiff
path: root/recipes/libpng
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2016-01-26 11:02:20 +0100
committerSebastian Dröge <sebastian@centricular.com>2016-01-26 11:02:20 +0100
commit778fb693a1258ae42e331d065c986401beb1f0da (patch)
tree2990d09cb372529a9c1bf82af6e65eb97d254bcb /recipes/libpng
parenteb89dab5543fda0ddd4e46f8f35800bc4ef2224b (diff)
ios: Don't unconditionally use GAS environment variable
We don't set it anymore for iOS i386/x86-64
Diffstat (limited to 'recipes/libpng')
-rw-r--r--recipes/libpng/libpng.recipe4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes/libpng/libpng.recipe b/recipes/libpng/libpng.recipe
index 48f4a4ee..ed15c923 100644
--- a/recipes/libpng/libpng.recipe
+++ b/recipes/libpng/libpng.recipe
@@ -16,6 +16,8 @@ class Recipe(recipe.Recipe):
def prepare(self):
if self.config.target_platform == Platform.IOS:
- self.new_env = {'CCAS': os.environ.get('GAS', '')}
+ if 'GAS' in os.environ:
+ self.new_env = {'CCAS': os.environ['GAS']}
+ self.new_env['CCAS'] += ' -no-integrated-as '
if self.config.target_arch == Architecture.ARM64:
self.configure_options += ' --disable-arm-neon '