jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

coriolisEnv.py must not start devtoolset-2 when already active.

This commit is contained in:
Jean-Paul Chaput 2015-02-03 23:41:55 +01:00
parent 4fd34a85a1
commit 05ec238080
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bootstrap/coriolisEnv.py
View File

@ -106,6 +106,9 @@ def guessOs ():
print "[WARNING] Unrecognized OS: \"%s\"." % lines[0][:-1] print "[WARNING] Unrecognized OS: \"%s\"." % lines[0][:-1]
print " (using: \"%s\")" % osType print " (using: \"%s\")" % osType
ldLibraryPath = os.getenv('LD_LIBRARY_PATH')
if 'devtoolset' in ldLibraryPath: useDevtoolset2 = False
return (osType,libDir,useDevtoolset2) return (osType,libDir,useDevtoolset2)