summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/Driver.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'clang/lib/Driver/Driver.cpp')
-rw-r--r--clang/lib/Driver/Driver.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 7db9e112a15..f7e15309ac3 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -2343,15 +2343,7 @@ void Driver::generatePrefixedToolNames(
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.
OpenPOWER on IntegriCloud