[llvm/el6] Switching back to X_SCLS because that's the offical RedHat environment variable

Dave Johansen daveisfera at fedoraproject.org
Fri Jan 2 19:12:25 UTC 2015


commit 4c38795a192cd642dd99177f1dd401b21387c3f8
Author: Dave Johansen <davejohansen at gmail.com>
Date:   Fri Jan 2 12:12:17 2015 -0700

    Switching back to X_SCLS because that's the offical RedHat environment variable

 0004-devtoolset.patch |    2 +-
 llvm.spec             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/0004-devtoolset.patch b/0004-devtoolset.patch
index e69d934..c22eccf 100644
--- a/0004-devtoolset.patch
+++ b/0004-devtoolset.patch
@@ -6,7 +6,7 @@
        Prefixes.push_back("/usr");
 +
 +    // RedHat Developer Toolset support
-+    if (const char *software_collections = getenv("CLANG_DTS_LIST")) {
++    if (const char *software_collections = getenv("X_SCLS")) {
 +      SmallVector<StringRef, 4> Scls;
 +      StringRef(software_collections).split(Scls, StringRef(" "), -1, false);
 +      for (const auto &Scl : Scls) {
diff --git a/llvm.spec b/llvm.spec
index f3d68a6..e69bbf8 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -672,7 +672,7 @@ exit 0
 
 %changelog
 * Fri Jan 02 2015 Dave Johansen <davejohansen at gmail.com> 3.4.2-4
-- Adding CLANG_DTS_LIST for turning on devtoolset use at runtime
+- Adding X_SCLS for turning on devtoolset use at runtime
 
 * Thu Nov 20 2014 Dave Johansen <davejohansen at gmail.com> 3.4.2-3
 - Fix for CVE-2014-2893


More information about the scm-commits mailing list