[cfe-commits] r140915 - /cfe/trunk/test/Driver/linux-ld.c

Chandler Carruth chandlerc at gmail.com
Fri Sep 30 20:26:44 CDT 2011


Author: chandlerc
Date: Fri Sep 30 20:26:40 2011
New Revision: 140915

URL: http://llvm.org/viewvc/llvm-project?rev=140915&view=rev
Log:
Allow for both 'lib' and 'lib32', as both seem to be in evidence. I've
left a FIXME to go track down more distros and see if 'lib' is ever the
64-bit half.

This should hopefully appease the build bots.

Modified:
    cfe/trunk/test/Driver/linux-ld.c

Modified: cfe/trunk/test/Driver/linux-ld.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/linux-ld.c?rev=140915&r1=140914&r2=140915&view=diff
==============================================================================
--- cfe/trunk/test/Driver/linux-ld.c (original)
+++ cfe/trunk/test/Driver/linux-ld.c Fri Sep 30 20:26:40 2011
@@ -2,8 +2,10 @@
 //
 // RUN: %clang -no-canonical-prefixes -ccc-host-triple i386-unknown-linux %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-LD-32 %s
-// CHECK-LD-32: "{{.*}}ld" {{.*}} "-L/lib/../lib32" "-L/usr/lib/../lib32"
+// 32-bit machines may use 'lib' or 'lib32' dependending on how they setup multilib.
+// CHECK-LD-32: "{{.*}}ld" {{.*}} "-L/lib/../lib{{32|}}" "-L/usr/lib/../lib{{32|}}"
 //
 // RUN: %clang -no-canonical-prefixes -ccc-host-triple x86_64-unknown-linux %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-LD-64 %s
+// FIXME: Should we allow 'lib' instead of 'lib64' here?
 // CHECK-LD-64: "{{.*}}ld" {{.*}} "-L/lib/../lib64" "-L/usr/lib/../lib64"




More information about the cfe-commits mailing list