diff options
| author | Steven Knight <knight@baldmt.com> | 2005-10-08 04:09:33 +0000 |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-10-08 04:09:33 +0000 |
| commit | 2d0d82237c691d0783329ae70ba7b49bbd3649a6 (patch) | |
| tree | 1936a35a76ca78d644fb1dcc51eaf421da2f1081 | |
| parent | af9c2236034aec3e408ae4dd6f2eb8bbc7e24f2f (diff) | |
| download | scons-2d0d82237c691d0783329ae70ba7b49bbd3649a6.tar.gz | |
Add /sw/bin to the default PATH on Darwin systems. (Greg Noel) Add /opt/bin to the default PATH on all POSIX systems. (Asfand Yar Qazi)
| -rw-r--r-- | src/CHANGES.txt | 6 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/darwin.py | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/posix.py | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 52fd9777..8fd81cc5 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -424,6 +424,8 @@ RELEASE 0.97 - XXX - Re-order link lines so the -o option always comes right after the command name. + - Add /sw/bin to the default execution PATH on Mac OS X. + From Gary Oberbrunner: - Add an Environment.Dump() method to print the contents of a @@ -500,6 +502,10 @@ RELEASE 0.97 - XXX - On Windows, preserve the external environment's %SYSTEMDRIVE% variable, too. + From Asfand Yar Qazi: + + - Add /opt/bin to the default execution PATH on all POSIX platforms. + From Kevin Quick: - Fix the Builder name returned from ListBuilders and other instances diff --git a/src/engine/SCons/Platform/darwin.py b/src/engine/SCons/Platform/darwin.py index 3f9b796a..7883795a 100644 --- a/src/engine/SCons/Platform/darwin.py +++ b/src/engine/SCons/Platform/darwin.py @@ -38,3 +38,4 @@ import os def generate(env): posix.generate(env) env['SHLIBSUFFIX'] = '.dylib' + env['ENV']['PATH'] = env['ENV']['PATH'] + ':/sw/bin' diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py index 5f1cfa1c..4822c35f 100644 --- a/src/engine/SCons/Platform/posix.py +++ b/src/engine/SCons/Platform/posix.py @@ -224,7 +224,7 @@ def generate(env): if not env.has_key('ENV'): env['ENV'] = {} - env['ENV']['PATH'] = '/usr/local/bin:/bin:/usr/bin' + env['ENV']['PATH'] = '/usr/local/bin:/bin:/usr/bin:/opt/bin' env['OBJPREFIX'] = '' env['OBJSUFFIX'] = '.o' env['SHOBJPREFIX'] = '$OBJPREFIX' |