diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-10-01 13:23:10 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-10-01 13:23:10 +0200 |
| commit | 0414abd565dbdf12ea741930bef5268bc7fe6da3 (patch) | |
| tree | aa7e983f81ffe2090fa31869b6670bf18bcc28a0 /engine/SCons/Platform/darwin.py | |
| parent | 3765e33b76c51c81dd7bbbfacab0c4e76a1713cb (diff) | |
| parent | 3bab2962eecc24c19366692e52ebca5eb835d117 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'engine/SCons/Platform/darwin.py')
| -rw-r--r-- | engine/SCons/Platform/darwin.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engine/SCons/Platform/darwin.py b/engine/SCons/Platform/darwin.py index d3b77db..70ffcf4 100644 --- a/engine/SCons/Platform/darwin.py +++ b/engine/SCons/Platform/darwin.py @@ -8,7 +8,7 @@ selection method. """ # -# Copyright (c) 2001 - 2016 The SCons Foundation +# Copyright (c) 2001 - 2017 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -30,9 +30,9 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/darwin.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" +__revision__ = "src/engine/SCons/Platform/darwin.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" -import posix +from . import posix import os def generate(env): @@ -63,6 +63,10 @@ def generate(env): env.AppendENVPath('PATHOSX', line.strip('\n')) f.close() + # Not sure why this wasn't the case all along? + if env['ENV'].get('PATHOSX', False) and os.environ.get('SCONS_USE_MAC_PATHS', False): + env.AppendENVPath('PATH',env['ENV']['PATHOSX']) + # Local Variables: # tab-width:4 # indent-tabs-mode:nil |