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 | |
| parent | eb89dab5543fda0ddd4e46f8f35800bc4ef2224b (diff) | |
ios: Don't unconditionally use GAS environment variable
We don't set it anymore for iOS i386/x86-64
| -rw-r--r-- | recipes/libmad.recipe | 5 | ||||
| -rw-r--r-- | recipes/libmpeg2.recipe | 5 | ||||
| -rw-r--r-- | recipes/libpng/libpng.recipe | 4 | ||||
| -rw-r--r-- | recipes/x264.recipe | 5 |
4 files changed, 12 insertions, 7 deletions
diff --git a/recipes/libmad.recipe b/recipes/libmad.recipe index ac16edf2..7d326c01 100644 --- a/recipes/libmad.recipe +++ b/recipes/libmad.recipe @@ -18,8 +18,9 @@ class Recipe(recipe.Recipe): def prepare(self): if self.config.target_platform == Platform.IOS: self.configure_options += ' --enable-fpm=default ' - self.new_env = {'CCAS': os.environ['GAS']} - self.new_env['CCAS'] += ' -no-integrated-as ' + if 'GAS' in os.environ: + self.new_env = {'CCAS': os.environ['GAS']} + self.new_env['CCAS'] += ' -no-integrated-as ' self.patches += ['libmad/0004-Remove-clang-unsupported-compiler-flags.patch'] elif self.config.target_platform == Platform.DARWIN: self.patches += ['libmad/0004-Remove-clang-unsupported-compiler-flags.patch'] diff --git a/recipes/libmpeg2.recipe b/recipes/libmpeg2.recipe index 32a3a937..b56e1d31 100644 --- a/recipes/libmpeg2.recipe +++ b/recipes/libmpeg2.recipe @@ -23,8 +23,9 @@ class Recipe(recipe.Recipe): self.configure_options += ' --disable-sdl ' if self.config.target_platform == Platform.IOS: if Architecture.is_arm(self.config.target_arch): - self.new_env = {'CCAS': os.environ['GAS']} - self.new_env['CCAS'] += ' -no-integrated-as ' + if 'GAS' in os.environ: + self.new_env = {'CCAS': os.environ['GAS']} + self.new_env['CCAS'] += ' -no-integrated-as ' self.append_env = {'LDFLAGS': ' -Wl,-read_only_relocs,suppress'} def compile(self): 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 ' 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 |