summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-04-09 01:22:54 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2017-04-09 01:22:54 (GMT)
commit1d60cfed5451fabf22ec48256248b6d3ad57b594 (patch)
treecff99a83233a3c9a8be52c3a51c5bc982838cfea
parent841c3b0c2960822c4cc02235b104d5487316ac30 (diff)
downloadSCons-1d60cfed5451fabf22ec48256248b6d3ad57b594.zip
SCons-1d60cfed5451fabf22ec48256248b6d3ad57b594.tar.gz
SCons-1d60cfed5451fabf22ec48256248b6d3ad57b594.tar.bz2
OSX: if user has SCONS_USE_MAC_PATHS environment variable set, then PATHOSX created from paths in /etc/paths and /etc/paths.d/* will be appended to the Environment's PATH. This allows tests (and builds) to work on (at least) on mac systems using macports
-rw-r--r--src/engine/SCons/Platform/darwin.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/engine/SCons/Platform/darwin.py b/src/engine/SCons/Platform/darwin.py
index 1cf4aeb..c85b75b 100644
--- a/src/engine/SCons/Platform/darwin.py
+++ b/src/engine/SCons/Platform/darwin.py
@@ -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