objc.exp (objc_target_compile): Look for libobjc-gnu.a also when -fgnu-runtime is...

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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6e5781ed653c144a919641a6386e288309be6080..2de2493b78f74278209552474ee7cdbadbaabf78 100644 (file)
--- 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 d00da0fa92e2f3870dd25d91cf48810b07c8ce9a..a423758d2737f5115d7d41bfbda1d11756e3a987 100644 (file)
--- 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}"