diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-30 15:07:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-30 15:07:18 +0100 |
| commit | dcc7f2b54b562ad5a58dcd0dfe72ad8e6f05deb9 (patch) | |
| tree | 8182a38f1be82c70d31b6c8610fdc0b6c117f73d /platform/iphone | |
| parent | 534044e8f8921d90677f7bc307dd2997d6eb873e (diff) | |
| parent | d52100f4ffd3191ca070be34043c5a5343cd1a0b (diff) | |
Merge pull request #24545 from akien-mga/osxcross-mono
SCons: Allow building Mono module with OSXCross
Diffstat (limited to 'platform/iphone')
| -rw-r--r-- | platform/iphone/SCsub | 2 | ||||
| -rw-r--r-- | platform/iphone/detect.py | 4 |
2 files changed, 5 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" diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index ee0e36b926..20fb4428dd 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -76,6 +76,10 @@ def configure(env): ## Compiler configuration + # Save this in environment for use by other modules + if "OSXCROSS_IOS" in os.environ: + env["osxcross"] = True + env['ENV']['PATH'] = env['IPHONEPATH'] + "/Developer/usr/bin/:" + env['ENV']['PATH'] compiler_path = '$IPHONEPATH/usr/bin/${ios_triple}' |