From 1256cc818b9227e4ff2b17f60c47e04aa21b6f5b Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Sat, 11 Jun 2016 04:57:29 +0000 Subject: 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 --- clang/lib/Driver/Driver.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'clang/lib/Driver/Driver.cpp') 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 &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. -- cgit v1.2.3