diff options
| author | William Deegan <bill@baddogconsulting.com> | 2011-06-17 03:04:17 +0000 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2011-06-17 03:04:17 +0000 |
| commit | 09c2e07f67522b5b7c0103e7ada36abdd8a96774 (patch) | |
| tree | 75de04d8405b92cce2257993900d0141d3bff3c3 | |
| parent | af6e4e61541fc2e85d7dd14ec8a59d47dab29a73 (diff) | |
| download | scons-09c2e07f67522b5b7c0103e7ada36abdd8a96774.tar.gz | |
Fix bug 2772
| -rw-r--r-- | QMTest/TestSCons.py | 2 | ||||
| -rw-r--r-- | src/CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/intelc.py | 2 | ||||
| -rw-r--r-- | test/LoadableModule.py | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 36eb4071..27cfcb89 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -669,7 +669,7 @@ class TestSCons(TestCommon): if sys.platform == 'win32': result.append(os.path.join(d,'win32')) - elif sys.platform == 'linux2': + elif sys.platform.startswith('linux'): result.append(os.path.join(d,'linux')) return result diff --git a/src/CHANGES.txt b/src/CHANGES.txt index dd052498..318bd078 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 b4a3c907..1eceff57 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: diff --git a/test/LoadableModule.py b/test/LoadableModule.py index 574b0cdf..18a9c43c 100644 --- a/test/LoadableModule.py +++ b/test/LoadableModule.py @@ -43,6 +43,7 @@ dlopen_line = { 'darwin' : no_dl_lib, 'freebsd4' : no_dl_lib, 'linux2' : use_dl_lib, + 'linux3' : use_dl_lib, } platforms_with_dlopen = list(dlopen_line.keys()) |