summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-10-08 18:12:43 (GMT)
committerSteven Knight <knight@baldmt.com>2005-10-08 18:12:43 (GMT)
commit36567ecc2f31498b24a8d479b69b25b975a63ae0 (patch)
treefc66de921277a1e19cfabe77b9b634a4851883b2
parent7935d8f439453bb30c0db7b1dedcffda71521030 (diff)
downloadSCons-36567ecc2f31498b24a8d479b69b25b975a63ae0.zip
SCons-36567ecc2f31498b24a8d479b69b25b975a63ae0.tar.gz
SCons-36567ecc2f31498b24a8d479b69b25b975a63ae0.tar.bz2
Move /opt/bin to between /usr/local/bin and /bin on the default POSIX path.
-rw-r--r--src/CHANGES.txt3
-rw-r--r--src/RELEASE.txt14
-rw-r--r--src/engine/SCons/Platform/posix.py2
3 files changed, 17 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 902b915..383be62 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -517,7 +517,8 @@ RELEASE 0.97 - XXX
From Asfand Yar Qazi:
- - Add /opt/bin to the default execution PATH on all POSIX platforms.
+ - Add /opt/bin to the default execution PATH on all POSIX platforms
+ (between /usr/local/bin and /bin).
From Kevin Quick:
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 7e61b61..776f16b 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -157,6 +157,20 @@ RELEASE 0.97 - XXX
env = Environment(tools = ['default', 'f77'])
+ -- /opt/bin AND /sw/bin ADDED TO DEFAULT EXECUTION PATH VARIABLES
+
+ On all POSIX systems, the default execution PATH variable has had
+ the /opt/bin directory added after the /usr/local/bin directory
+ and before /bin and /usr/bin directories. This may cause SCons
+ to find and/or different compilers, linkers, etc. if you have
+ any same-named utilities installed in /opt/bin that it previously
+ found in /bin or /usr/bin.
+
+ On Mac OS X (Darwin) systems, the /sw/bin directory has been added
+ to the end of the default execution PATH. This may cause SCons
+ to find compilers, linkers and other utilities it previously did
+ not, although it should not otherwise change existing behavior.
+
-- SOLARIS DEFAULT SHARED OBJECT PREFIXES AND SUFFIXES HAVE CHANGED
On Solaris, SCons now builds shared objects from C and C++ source
diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
index 4822c35..675167e 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:/opt/bin'
+ env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
env['OBJPREFIX'] = ''
env['OBJSUFFIX'] = '.o'
env['SHOBJPREFIX'] = '$OBJPREFIX'