diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-07-22 09:03:04 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-07-22 10:07:58 +0530 |
| commit | 76c8a52f532d1b8f990a95630663cf222d583575 (patch) | |
| tree | 2ab603197e2615bf88393de95b3fe91d9bf2cafe /recipes | |
| parent | 8539c509cbcac82ceb2afd99488b6b40764b98ca (diff) | |
gst-libav-1.0.recipe: Fix setting of AS on ARM
Needs to always be set, not just sometimes.
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/gst-libav-1.0.recipe | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/recipes/gst-libav-1.0.recipe b/recipes/gst-libav-1.0.recipe index 32aad207..8f453c72 100644 --- a/recipes/gst-libav-1.0.recipe +++ b/recipes/gst-libav-1.0.recipe @@ -26,6 +26,14 @@ class Recipe(custom.GStreamer): ] def prepare(self): + # Default AS is $CC, except iOS (set below) + if Architecture.is_arm(self.config.target_arch): + if self.config.target_platform == Platform.IOS: + if 'GAS' in os.environ: + self.set_env('AS', os.environ['GAS']) + else: + self.set_env('AS', os.environ['CC']) + if self.config.target_platform == Platform.DARWIN: if self.config.target_arch == Architecture.X86_64: asflags = ' -arch x86_64 -m64' @@ -51,9 +59,6 @@ class Recipe(custom.GStreamer): libavextraconf += " --disable-asm" self.configure_options += ' --with-libav-extra-configure="%s"' % libavextraconf elif self.config.target_platform == Platform.IOS: - if Architecture.is_arm(self.config.target_arch): - if 'GAS' in os.environ: - self.set_env('AS', os.environ['GAS']) # Some optimisations that were previously silently disabled # cause warnings now. Ignore them libavextraconf = " --extra-cflags='-Wno-ignored-optimization-argument' " |