From d52100f4ffd3191ca070be34043c5a5343cd1a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 22 Dec 2018 12:31:43 +0100 Subject: 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. --- modules/webm/libvpx/SCsub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/webm/libvpx/SCsub') 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: -- cgit v1.2.3