summaryrefslogtreecommitdiff
path: root/test/Driver/cross-linux.c
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-10-28 23:14:34 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-10-28 23:14:34 +0000
commit9a478245aecf58ca4e68ed629a840a74437e0ec1 (patch)
tree22f01c8683b383cdd79244e720ba154d726b28d5 /test/Driver/cross-linux.c
parent5794b53ad5b38b53c9eaf3a172354e63081ceb2f (diff)
downloadclang-9a478245aecf58ca4e68ed629a840a74437e0ec1.tar.gz
Revert "Support cross linking to arm on ubuntu."
This reverts commit r193528 (and fixes). It broke Chandler's setup. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193554 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Driver/cross-linux.c')
-rw-r--r--test/Driver/cross-linux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Driver/cross-linux.c b/test/Driver/cross-linux.c
index 3d43848139..3013d80f4c 100644
--- a/test/Driver/cross-linux.c
+++ b/test/Driver/cross-linux.c
@@ -36,7 +36,7 @@
// CHECK-MULTI32-I386: "-m" "elf_i386"
// CHECK-MULTI32-I386: "crti.o" "[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.0]]{{/|\\\\}}crtbegin.o"
// CHECK-MULTI32-I386: "-L[[gcc_install]]"
-// CHECK-MULTI32-I386: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib/../lib"
+// CHECK-MULTI32-I386: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib/../lib32"
// CHECK-MULTI32-I386: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib"
// CHECK-MULTI32-I386: "-L[[sysroot]]/lib"
// CHECK-MULTI32-I386: "-L[[sysroot]]/usr/lib"
@@ -89,7 +89,7 @@
// CHECK-MULTI64-X86-64: "-m" "elf_x86_64"
// CHECK-MULTI64-X86-64: "crti.o" "[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.0]]{{/|\\\\}}crtbegin.o"
// CHECK-MULTI64-X86-64: "-L[[gcc_install]]"
-// CHECK-MULTI64-X86-64: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib/../lib"
+// CHECK-MULTI64-X86-64: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib/../lib64"
// CHECK-MULTI64-X86-64: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib"
// CHECK-MULTI64-X86-64: "-L[[sysroot]]/lib"
// CHECK-MULTI64-X86-64: "-L[[sysroot]]/usr/lib"