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. --- platform/osx/detect.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'platform/osx/detect.py') diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 051836b66d..6eee8f204f 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -72,7 +72,11 @@ def configure(env): ## Compiler configuration - if "OSXCROSS_ROOT" not in os.environ: # regular native build + # Save this in environment for use by other modules + if "OSXCROSS_ROOT" in os.environ: + env["osxcross"] = True + + if not "osxcross" in env: # regular native build env.Append(CCFLAGS=['-arch', 'x86_64']) env.Append(LINKFLAGS=['-arch', 'x86_64']) if (env["macports_clang"] != 'no'): -- cgit v1.2.3