diff options
| author | Dan Albert <danalbert@google.com> | 2018-04-24 22:06:40 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2018-04-24 22:06:40 +0000 |
| commit | 07b0059083f2df678f0bb7d1a8f7b810bc854bdc (patch) | |
| tree | 8eaf54ee53c733b84393ff4545885e05ec8b49de /clang/test/Driver/android-ndk-standalone.cpp | |
| parent | 891c8fb7536136372b94b843966e2b0e19fc8927 (diff) | |
| download | bcm5719-llvm-07b0059083f2df678f0bb7d1a8f7b810bc854bdc.tar.gz bcm5719-llvm-07b0059083f2df678f0bb7d1a8f7b810bc854bdc.zip | |
Revert "[Driver] Android triples are not aliases for other triples."
Revering while I diagnose the failures.
This reverts commit 82dc3bf2157da280420f80e654292cb05e0dc5f7.
llvm-svn: 330780
Diffstat (limited to 'clang/test/Driver/android-ndk-standalone.cpp')
| -rw-r--r-- | clang/test/Driver/android-ndk-standalone.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/clang/test/Driver/android-ndk-standalone.cpp b/clang/test/Driver/android-ndk-standalone.cpp index ff2f39defc9..fb5ce25659d 100644 --- a/clang/test/Driver/android-ndk-standalone.cpp +++ b/clang/test/Driver/android-ndk-standalone.cpp @@ -302,38 +302,3 @@ // CHECK-X86_64: "-L{{.*}}/sysroot/usr/lib/x86_64-linux-android/21" // CHECK-X86_64: "-L{{.*}}/sysroot/usr/lib/x86_64-linux-android" // CHECK-X86_64: "-L{{.*}}/lib/gcc/x86_64-linux-android/4.9/../../../../x86_64-linux-android/lib" - -// We need two sets of tests to verify that we both don't find non-Android -// toolchains installations and that we *do* find Android toolchains. We can't -// do both at the same time in this environment because we need to pass -// --sysroot to find the toolchains which would override searching in /usr. In a -// production environment --sysroot is not used and the toolchains are instead -// found relative to the clang binary, so both would be considered. - -// RUN: %clang -v --target=i686-linux-android \ -// RUN: 2>&1 | FileCheck --check-prefix=CHECK-I686-GCC-NOSYS %s -// -// CHECK-I686-GCC-NOSYS-NOT: Found candidate GCC installation: /usr{{.*}} -// -// RUN: %clang -v --target=i686-linux-android \ -// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree \ -// RUN: 2>&1 | FileCheck --check-prefix=CHECK-I686-GCC %s -// -// CHECK-I686-GCC-NOT: Found candidate GCC installation: /usr{{.*}} -// CHECK-I686-GCC: Found candidate GCC installation: {{.*}}i686-linux-android/4.9 -// CHECK-I686-GCC-NEXT: Found candidate GCC installation: {{.*}}x86_64-linux-android/4.9 -// CHECK-I686-GCC-NEXT: Selected GCC installation: {{.*}}i686-linux-android/4.9 - -// RUN: %clang -v --target=x86_64-linux-android \ -// RUN: 2>&1 | FileCheck --check-prefix=CHECK-X86_64-GCC-NOSYS %s -// -// CHECK-X86_64-GCC-NOSYS-NOT: Found candidate GCC installation: /usr{{.*}} - -// RUN: %clang -v --target=x86_64-linux-android \ -// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree \ -// RUN: 2>&1 | FileCheck --check-prefix=CHECK-X86_64-GCC %s -// -// CHECK-X86_64-GCC-NOT: Found candidate GCC installation: /usr{{.*}} -// CHECK-X86_64-GCC: Found candidate GCC installation: {{.*}}i686-linux-android/4.9 -// CHECK-X86_64-GCC-NEXT: Found candidate GCC installation: {{.*}}x86_64-linux-android/4.9 -// CHECK-X86_64-GCC-NEXT: Selected GCC installation: {{.*}}x86_64-linux-android/4.9 |
