diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-03-29 21:55:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 21:55:45 +0200 |
| commit | 769b9b54b98ed67a134545dfaaee47a71778ed6c (patch) | |
| tree | 302f38067302466f9d161a59815f1976bf08ce5e /modules | |
| parent | 4dbae5a738e33ffe4ab69e84c006bff2adc24cf8 (diff) | |
| parent | e7b9e2f97099bb37fc59dfc00affa04cee18a5d7 (diff) | |
Merge pull request #17825 from Faless/osxcross_fix
Fix IPhone and OSX cross compilation
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/webm/libvpx/SCsub | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index 0ebafa022d..b09c232b3c 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -340,7 +340,7 @@ if webm_simd_optimizations == False: env_libvpx.add_source_files(env.modules_sources, libvpx_sources) if webm_cpu_x86: - is_clang_or_gcc = ('gcc' in env["CC"]) or ('clang' in env["CC"]) + is_clang_or_gcc = ('gcc' in env["CC"]) or ('clang' in env["CC"]) or ("OSXCROSS_ROOT" in os.environ) env_libvpx_mmx = env_libvpx.Clone() if cpu_bits == '32' and is_clang_or_gcc: |