diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-22 12:31:43 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-22 12:36:19 +0100 |
| commit | d52100f4ffd3191ca070be34043c5a5343cd1a0b (patch) | |
| tree | 790e7c4f99e12b225fa2b5f5c1da111a205898be /modules/webm/libvpx | |
| parent | 404f39422665375e62863c0247768759bb2cd0be (diff) | |
SCons: Allow building Mono module with OSXCross
Improve the test logic to only assume that we're building for macOS
if OSXCROSS_ROOT is defined *and* we requested p=osx.
Supersedes #24480.
Diffstat (limited to 'modules/webm/libvpx')
| -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 348de485be..36de31828d 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -350,7 +350,7 @@ if webm_multithread: env_libvpx.add_source_files(env.modules_sources, libvpx_sources_mt) if webm_cpu_x86: - is_clang_or_gcc = ('gcc' in os.path.basename(env["CC"])) or ('clang' in os.path.basename(env["CC"])) or ("OSXCROSS_ROOT" in os.environ) + is_clang_or_gcc = ('gcc' in os.path.basename(env["CC"])) or ('clang' in os.path.basename(env["CC"])) or ("osxcross" in env) env_libvpx_mmx = env_libvpx.Clone() if cpu_bits == '32' and is_clang_or_gcc: |