diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
| commit | fd46865a502036b9e4414e7ec4950faf551b1f14 (patch) | |
| tree | 634dbca07e829d3906ed555341118c361aa1bb14 /scripts | |
| parent | de7d6cf4dfa1db2945e3ed4a3e8257d72674a496 (diff) | |
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/install.py b/scripts/install.py index 67b1c8f409..d72d81868d 100755 --- a/scripts/install.py +++ b/scripts/install.py @@ -769,14 +769,16 @@ def _get_platform(): # 'linux64' platform with 'linux/x86_64/gcc/4.1' this_platform = 'linux64' else: - gcc_version = os.popen("g++ -dumpversion", 'r').read()[:-3] - if gcc_version == '4.1': + gcc_version = os.popen("g++ -dumpversion", 'r').read() + if gcc_version[:3] == '4.1': # the 'linux32' platform is a HACK until we can figure # out how to make the install.py script accept a platform of # the form os/arch/compiler/compiler_version for the download # and extract stage #this_platform = 'linux/i686/gcc/4.1' - this_platform = 'linux32' + # NOTE: disabled linux32 as it hasn't been tested well + #this_platform = 'linux32' + this_platform = this_platform return this_platform def _getuser(): |