From b111063283eba5a614f4429f529f0ebb12cb130d Mon Sep 17 00:00:00 2001 From: stevenknight Date: Sat, 8 Oct 2005 18:12:43 +0000 Subject: [PATCH] Move /opt/bin to between /usr/local/bin and /bin on the default POSIX path. git-svn-id: http://scons.tigris.org/svn/scons/trunk@1365 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- src/CHANGES.txt | 3 ++- src/RELEASE.txt | 14 ++++++++++++++ src/engine/SCons/Platform/posix.py | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 902b9159..383be627 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 7e61b616..776f16bd 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 4822c35f..675167e4 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' -- 2.26.2