diff options
| author | Geoff Keating <geoffk@cygnus.com> | 2000-08-02 22:24:35 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2000-08-02 22:24:35 +0000 |
| commit | e457ca6a318a8411b2634430cb8ecd209ecf883f (patch) | |
| tree | eb56d4711f640e11c802e72725d6959879fc719c | |
| parent | c9b6494a2415efed8ad89952adc3640f54d87c3f (diff) | |
| download | gcc-e457ca6a318a8411b2634430cb8ecd209ecf883f.zip gcc-e457ca6a318a8411b2634430cb8ecd209ecf883f.tar.gz gcc-e457ca6a318a8411b2634430cb8ecd209ecf883f.tar.bz2 | |
objc.exp (objc_target_compile): Look for libobjc.a in libobjc/.libs to allow for libtool.
* lib/objc.exp (objc_target_compile): Look for libobjc.a in
libobjc/.libs to allow for libtool.
From-SVN: r35437
| -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 81c2c95..7f61d2a 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 d67ef04..e537f78 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}" |