summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2011-06-17 03:04:17 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2011-06-17 03:04:17 (GMT)
commitd40be209baefa11b56c9d6961d7976958de425da (patch)
tree75de04d8405b92cce2257993900d0141d3bff3c3 /src
parent329d00dfba48b6ded22381aa0d3ba63c7697a54a (diff)
downloadSCons-d40be209baefa11b56c9d6961d7976958de425da.zip
SCons-d40be209baefa11b56c9d6961d7976958de425da.tar.gz
SCons-d40be209baefa11b56c9d6961d7976958de425da.tar.bz2
Fix bug 2772
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt1
-rw-r--r--src/engine/SCons/Tool/intelc.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index dd05249..318bd07 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -189,6 +189,7 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
- Remove warning for not finding MS VC/VS install.
"scons: warning: No version of Visual Studio compiler found
- C/C++ compilers most likely not set correctly"
+ - Add support for Linux 3.0
RELEASE 2.0.1 - Mon, 15 Aug 2010 15:46:32 -0700
diff --git a/src/engine/SCons/Tool/intelc.py b/src/engine/SCons/Tool/intelc.py
index b4a3c90..1eceff5 100644
--- a/src/engine/SCons/Tool/intelc.py
+++ b/src/engine/SCons/Tool/intelc.py
@@ -40,7 +40,7 @@ is_windows = sys.platform == 'win32'
is_win64 = is_windows and (os.environ['PROCESSOR_ARCHITECTURE'] == 'AMD64' or
('PROCESSOR_ARCHITEW6432' in os.environ and
os.environ['PROCESSOR_ARCHITEW6432'] == 'AMD64'))
-is_linux = sys.platform == 'linux2'
+is_linux = sys.platform.startswith('linux')
is_mac = sys.platform == 'darwin'
if is_windows: