Revert "Strip Android version when looking up toolchain paths."
This reverts commit r272413. The tests here have been failing on several
different build bots for over 10 hours.
llvm-svn: 272454
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 7db9e11..f7e1530 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -2343,15 +2343,7 @@
const char *Tool, const ToolChain &TC,
SmallVectorImpl<std::string> &Names) const {
// FIXME: Needs a better variable than DefaultTargetTriple
- StringRef Triple = DefaultTargetTriple;
-
- // On Android, the target triple can include a version number that needs to
- // be stripped.
- if (TC.getTriple().isAndroid()) {
- Triple = Triple.rtrim("0123456789");
- }
-
- Names.emplace_back((Triple + "-" + Tool).str());
+ Names.emplace_back(DefaultTargetTriple + "-" + Tool);
Names.emplace_back(Tool);
// Allow the discovery of tools prefixed with LLVM's default target triple.