diff options
Diffstat (limited to 'gcc')
| -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}" |