diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2016-06-11 04:57:29 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2016-06-11 04:57:29 +0000 |
| commit | 1256cc818b9227e4ff2b17f60c47e04aa21b6f5b (patch) | |
| tree | 8178016e90d799083e1d5cff46f14d1888eb729e /clang | |
| parent | b1bcd5dc7b875e0cdd33573c1736010b35880a14 (diff) | |
| download | bcm5719-llvm-1256cc818b9227e4ff2b17f60c47e04aa21b6f5b.tar.gz bcm5719-llvm-1256cc818b9227e4ff2b17f60c47e04aa21b6f5b.zip | |
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
Diffstat (limited to 'clang')
4 files changed, 1 insertions, 19 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. diff --git a/clang/test/Driver/Inputs/android_triple_version/bin/arm-linux-androideabi-ld b/clang/test/Driver/Inputs/android_triple_version/bin/arm-linux-androideabi-ld deleted file mode 100755 index e69de29bb2d..00000000000 --- a/clang/test/Driver/Inputs/android_triple_version/bin/arm-linux-androideabi-ld +++ /dev/null diff --git a/clang/test/Driver/Inputs/android_triple_version/bin/arm-linux-androideabi-ld.exe b/clang/test/Driver/Inputs/android_triple_version/bin/arm-linux-androideabi-ld.exe deleted file mode 100755 index e69de29bb2d..00000000000 --- a/clang/test/Driver/Inputs/android_triple_version/bin/arm-linux-androideabi-ld.exe +++ /dev/null diff --git a/clang/test/Driver/android-triple-version.c b/clang/test/Driver/android-triple-version.c deleted file mode 100644 index 093f71f88bd..00000000000 --- a/clang/test/Driver/android-triple-version.c +++ /dev/null @@ -1,10 +0,0 @@ -// Android's target triples can contain a version number in the environment -// field (e.g. arm-linux-androideabi9). -// Make sure that any version is stripped when finding toolchain binaries. - -// RUN: env "PATH=%S/Inputs/android_triple_version/bin" \ -// RUN: %clang -### -target arm-linux-androideabi %s 2>&1 | FileCheck %s -// RUN: env "PATH=%S/Inputs/android_triple_version/bin" \ -// RUN: %clang -### -target arm-linux-androideabi9 %s 2>&1 | FileCheck %s - -// CHECK: arm-linux-androideabi-ld |
