objc.exp (objc_target_compile): Look for libobjc.a in libobjc/.libs to allow for...

* lib/objc.exp (objc_target_compile): Look for libobjc.a in
libobjc/.libs to allow for libtool.

From-SVN: r35437

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 81c2c9509892974d23ecd81792c3ba49989c9270..7f61d2aeddaf2d46ccdd54c170310a6aa4210205 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-02  Geoff Keating  <geoffk@cygnus.com>
+
+       * lib/objc.exp (objc_target_compile): Look for libobjc.a in
+       libobjc/.libs to allow for libtool.
+
 2000-08-02  Jakub Jelinek  <jakub@redhat.com>
 
        * gcc.c-torture/compile/20000802-1.c: New test.

diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp
index d67ef04d72ea26c37ba0cd86321e60f231204675..e537f785ac1ee03a4a73779ac74d3d1cf14e27d2 100644 (file)
--- a/gcc/testsuite/lib/objc.exp
+++ b/gcc/testsuite/lib/objc.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1996, 1997, 2000 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -140,7 +140,7 @@ proc objc_target_compile { source dest type options } {
        lappend options "additional_flags=-DNO_VARARGS"
     }
     set objcpath "[get_multilibs]"
-    set libobjc_dir [lookfor_file ${objcpath} libobjc/libobjc.a]
+    set libobjc_dir [lookfor_file ${objcpath} libobjc/.libs/libobjc.a]
     if { $libobjc_dir != "" } {
        set objc_link_flags "-L[file dirname ${libobjc_dir}]"
        lappend options "additional_flags=${objc_link_flags}"