Fix Windows+MinGW which introduces noise into path separators.
There should be a better solution to this; Michael and I are continuing
to discuss exactly what it should be. The one solution I'm very
uncomfortable with is making the FileCheck tests use a regex for each
path separator.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141126 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 14ac85e..5fbbd38 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -1685,7 +1685,11 @@
BestVersion = CandidateVersion;
GccTriple = CandidateTriple.str();
- GccInstallPath = LI->path();
+ // FIXME: We hack together the directory name here instead of
+ // using LI to ensure stable path separators across Windows and
+ // Linux.
+ GccInstallPath = (TripleDir + Suffixes[l] + "/" +
+ VersionText.str());
GccParentLibPath = GccInstallPath + InstallSuffixes[l];
IsValid = true;
}