From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Sat, 8 Oct 2005 04:09:33 +0000 (+0000)
Subject: Add /sw/bin to the default PATH on Darwin systems.  (Greg Noel)  Add /opt/bin to... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2b9c2b2bc97674b7fba42259ffb94e25eba4b88e;p=scons.git

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)


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 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'