From 05ec238080c64df3bf8edaec87f6b855176839ae Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Tue, 3 Feb 2015 23:41:55 +0100
Subject: [PATCH] coriolisEnv.py must not start devtoolset-2 when already
 active.

---
 bootstrap/coriolisEnv.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bootstrap/coriolisEnv.py b/bootstrap/coriolisEnv.py
index 879eb8a2..f5ca3e57 100755
--- a/bootstrap/coriolisEnv.py
+++ b/bootstrap/coriolisEnv.py
@@ -106,6 +106,9 @@ def guessOs ():
 
       print "[WARNING] Unrecognized OS: \"%s\"." % lines[0][:-1]
       print "          (using: \"%s\")" % osType
+
+    ldLibraryPath = os.getenv('LD_LIBRARY_PATH')
+    if 'devtoolset' in ldLibraryPath: useDevtoolset2 = False
     
     return (osType,libDir,useDevtoolset2)