objc.exp (objc_target_compile): Add the -I path to ObjC header here...

        * lib/objc.exp (objc_target_compile): Add the -I path to ObjC
        header here...
        * lib/objc-torture.exp (objc-torture-compile): ...instead of here
        (objc-torture-execute): or here.

From-SVN: r55142

gcc/testsuite/ChangeLog

+2002-07-01  Stan Shebs  <shebs@apple.com>
+
+	* lib/objc.exp (objc_target_compile): Add the -I path to ObjC
+	header here...
+	* lib/objc-torture.exp (objc-torture-compile): ...instead of here
+	(objc-torture-execute): or here.
+
 Mon Jul  1 12:51:05 2002  J"orn Rennecke <joern.rennecke@superh.com>
 
 	* gcc.c-torture/execute/arith-rand-ll.c: New test.

gcc/testsuite/lib/objc-torture.exp

@@ -81,7 +81,7 @@ proc objc-torture-compile { src option } {
 
     # Run the compiler and analyze the results.
     set options ""
-    lappend options "additional_flags=-w $option -I${srcdir}/../../libobjc"
+    lappend options "additional_flags=-w $option"
 
     set comp_output [objc_target_compile "$src" "$output" object $options];
     objc_check_compile $testcase $option $output $comp_output
@@ -160,7 +160,7 @@ proc objc-torture-execute { src args } {
 	verbose "Testing $testcase, $option" 1
 
 	set options ""
-	lappend options "additional_flags=-w $option -I${srcdir}/../../libobjc"
+	lappend options "additional_flags=-w $option"
 	if { $additional_flags != "" } {
 	    lappend options "additional_flags=$additional_flags";
 	}

gcc/testsuite/lib/objc.exp

@@ -139,6 +139,7 @@ proc objc_target_compile { source dest type options } {
     global rootme;
     global tmpdir;
     global gluefile wrap_flags;
+    global srcdir
     global OBJC_UNDER_TEST
     global TOOL_OPTIONS
     global ld_library_path
@@ -167,6 +168,11 @@ proc objc_target_compile { source dest type options } {
     if [target_info exists objc,no_varargs] {
 	lappend options "additional_flags=-DNO_VARARGS"
     }
+
+    # Point to the ObjC headers in libobjc.
+    set objc_include_dir "${srcdir}/../../libobjc"
+    lappend options "additional_flags=-I${objc_include_dir}"
+
     set objcpath "[get_multilibs]"
     set libobjc_dir [lookfor_file ${objcpath} libobjc/.libs/libobjc.a]
     if { $libobjc_dir != "" } {