Index: lib/Driver/ToolChains/Gnu.cpp
===================================================================
--- lib/Driver/ToolChains/Gnu.cpp
+++ lib/Driver/ToolChains/Gnu.cpp
@@ -2173,10 +2173,11 @@
     SmallVector<StringRef, 2> Lines;
     File.get()->getBuffer().split(Lines, "\n");
     for (StringRef Line : Lines) {
+      StringRef TrimLine = Line.trim();
       // CURRENT=triple-version
-      if (Line.consume_front("CURRENT=")) {
+      if (TrimLine.consume_front("CURRENT=")) {
         const std::pair<StringRef, StringRef> ActiveVersion =
-          Line.rsplit('-');
+          TrimLine.rsplit('-');
         // Note: Strictly speaking, we should be reading
         // /etc/env.d/gcc/${CURRENT} now. However, the file doesn't
         // contain anything new or especially useful to us.