Add /sw/bin to the default PATH on Darwin systems. (Greg Noel) Add /opt/bin to...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1361 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 52fd9777fd4135c7893dc48260b19303fcab3943..8fd81cc5a57684ccb5f02576864389a0046f9d08 100644 (file)
--- 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 3f9b796a4a9775cda388d4a167b30ff0b545f0c2..7883795a65535030c3a4c0f608c5cb5b19ea0383 100644 (file)
--- 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 5f1cfa1c92766bdc886abb0f1f463994cc852db8..4822c35ffba87dbc8c3953cfc1d71bfc5bf2dbbe 100644 (file)
--- 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'