diff options
| author | Andrew Pinski <apinski@apple.com> | 2004-09-12 22:43:50 +0000 |
|---|---|---|
| committer | Andrew Pinski <pinskia@gcc.gnu.org> | 2004-09-12 15:43:50 -0700 |
| commit | a82525061721b26293ea4c55bf35efac295b6d0a (patch) | |
| tree | 22d39946318d4d7f6baec50c89c9f63fa6524b8c | |
| parent | 4c8dad30d21c280eb0ef238c4985252fff94694c (diff) | |
| download | gcc-a82525061721b26293ea4c55bf35efac295b6d0a.zip gcc-a82525061721b26293ea4c55bf35efac295b6d0a.tar.gz gcc-a82525061721b26293ea4c55bf35efac295b6d0a.tar.bz2 | |
objc.exp (objc_target_compile): Look for libobjc-gnu.a also when -fgnu-runtime is passed.
2004-09-12 Andrew Pinski <apinski@apple.com>
* lib/objc.exp (objc_target_compile): Look for libobjc-gnu.a also when
-fgnu-runtime is passed.
From-SVN: r87409
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/objc.exp | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6e5781e..2de2493 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-09-12 Andrew Pinski <apinski@apple.com> + + * lib/objc.exp (objc_target_compile): Look for libobjc-gnu.a also when + -fgnu-runtime is passed. + 2004-09-12 Richard Henderson <rth@redhat.com> * lib/fortran-torture.exp (add-ieee-options): Replace ieee-options; diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp index d00da0f..a423758 100644 --- a/gcc/testsuite/lib/objc.exp +++ b/gcc/testsuite/lib/objc.exp @@ -173,7 +173,14 @@ proc objc_target_compile { source dest type options } { # at it (and associated headers). set objcpath "[get_multilibs]" + set libobjc_dir [lookfor_file ${objcpath} libobjc/.libs/libobjc.a] + if { $libobjc_dir == ""} { + verbose "see if we have -fgnu-runtime in [target_info name]" + if [regexp ".*-fgnu-runtime.*" [target_info name]] { + set libobjc_dir [lookfor_file ${objcpath} libobjc/.libs/libobjc-gnu.a] + } + } if { $libobjc_dir != "" } { set objc_include_dir "${srcdir}/../../libobjc" lappend options "additional_flags=-I${objc_include_dir}" |