diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-01-26 11:02:20 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-01-26 11:02:20 +0100 |
| commit | 778fb693a1258ae42e331d065c986401beb1f0da (patch) | |
| tree | 2990d09cb372529a9c1bf82af6e65eb97d254bcb /recipes/x264.recipe | |
| parent | eb89dab5543fda0ddd4e46f8f35800bc4ef2224b (diff) | |
ios: Don't unconditionally use GAS environment variable
We don't set it anymore for iOS i386/x86-64
Diffstat (limited to 'recipes/x264.recipe')
| -rw-r--r-- | recipes/x264.recipe | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes/x264.recipe b/recipes/x264.recipe index d6084e5f..8868190d 100644 --- a/recipes/x264.recipe +++ b/recipes/x264.recipe @@ -43,8 +43,9 @@ class Recipe(recipe.Recipe): self.new_env = {'AS': os.environ.get('CC', '')} if self.config.target_platform == Platform.IOS: if Architecture.is_arm(self.config.target_arch): - self.new_env = {'AS': os.environ.get('GAS', '')} - self.new_env['AS'] += ' -no-integrated-as ' + if 'GAS' in os.environ: + self.new_env = {'AS': os.environ['GAS']} + self.new_env['AS'] += ' -no-integrated-as ' elif self.config.target_arch == Architecture.X86: enable_asm = False |