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 /platform/iphone/SCsub | |
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 'platform/iphone/SCsub')
-rw-r--r-- | platform/iphone/SCsub | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/iphone/SCsub b/platform/iphone/SCsub index debf051eda..d5540fe8db 100644 --- a/platform/iphone/SCsub +++ b/platform/iphone/SCsub @@ -23,7 +23,7 @@ ios_lib = env_ios.add_library('iphone', iphone_lib) def combine_libs(target=None, source=None, env=None): lib_path = target[0].srcnode().abspath - if ("OSXCROSS_IOS" in os.environ): + if "osxcross" in env: libtool = '$IPHONEPATH/usr/bin/${ios_triple}libtool' else: libtool = "$IPHONEPATH/usr/bin/libtool" |