diff options
| author | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-02 22:24:35 +0000 |
|---|---|---|
| committer | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-02 22:24:35 +0000 |
| commit | 99d5607ad258cc29ea67324e0b77038fc75bd4e5 (patch) | |
| tree | eb56d4711f640e11c802e72725d6959879fc719c /gcc | |
| parent | 385b48fc64d3378c333ffb1f98be8cd9c52bf04d (diff) | |
| download | gcc-99d5607ad258cc29ea67324e0b77038fc75bd4e5.tar.gz | |
* lib/objc.exp (objc_target_compile): Look for libobjc.a in
libobjc/.libs to allow for libtool.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35437 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/objc.exp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 81c2c950989..7f61d2aedda 100644 --- 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 d67ef04d72e..e537f785ac1 100644 --- 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}" |