diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2020-11-25 15:17:05 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2021-01-13 01:06:22 +0000 |
| commit | 7171fcd37d0ad5824186269a565d5529d24a7f68 (patch) | |
| tree | 000a93b3b8e75c0d003b32f602f2d9da8b679b5c | |
| parent | abf3cfb0a48fc94f8c616e3dade8b509ca6d062c (diff) | |
x264: add support for macOS ARM64
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/661>
| -rw-r--r-- | config/darwin.config | 6 | ||||
| -rw-r--r-- | recipes/x264.recipe | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/config/darwin.config b/config/darwin.config index bcd9775a..e3f3f87c 100644 --- a/config/darwin.config +++ b/config/darwin.config @@ -112,6 +112,12 @@ env['OBJCXX'] = 'clang++' # Since 10.10 libstdc++ is deprecated, and might no longer be # shipped. Make sure we use libc++ instead env['CXXFLAGS'] += ' -stdlib=libc++ ' +env['AS']= 'as' +if target_arch in [Architecture.X86, Architecture.X86_64]: + env.pop('GAS', None) +else: + env['GAS']= '%s %s %s -fembed-bitcode' % ('gas-preprocessor.pl', env['CC'], env['CFLAGS']) + if target_arch != Architecture.UNIVERSAL: diff --git a/recipes/x264.recipe b/recipes/x264.recipe index ee691870..2eaae962 100644 --- a/recipes/x264.recipe +++ b/recipes/x264.recipe @@ -37,7 +37,7 @@ class Recipe(recipe.Recipe): AS = [cc] else: AS = [] - if self.config.target_platform == Platform.IOS: + if self.config.target_platform in [Platform.IOS, Platform.DARWIN]: if Architecture.is_arm(self.config.target_arch): # x264 ships its own gas-preprocessor.pl AS = ['tools/' + self.get_env('GAS')] |