From ded736d4f7b4ece3a78fcd69aa7e55922b39cf5f Mon Sep 17 00:00:00 2001
From: shebs <shebs@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 1 Jul 2002 18:54:39 +0000
Subject: [PATCH] * 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@55142 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/testsuite/ChangeLog | 7 +++++++
gcc/testsuite/lib/objc-torture.exp | 4 ++--
gcc/testsuite/lib/objc.exp | 6 ++++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d7832d805f8e..deeb34a4f7a7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+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.
diff --git a/gcc/testsuite/lib/objc-torture.exp b/gcc/testsuite/lib/objc-torture.exp
index fbde5ec94efa..ec05da91d0da 100644
--- a/gcc/testsuite/lib/objc-torture.exp
+++ b/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";
}
diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp
index a1431a116ec0..9042a283dcc9 100644
--- a/gcc/testsuite/lib/objc.exp
+++ b/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 != "" } {
--
GitLab