From d68c6656d0f26a07b0507db4ddaa6db2a23d8634 Mon Sep 17 00:00:00 2001
From: drow <drow@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 4 Mar 2003 19:44:09 +0000
Subject: [PATCH] * configure.in: Don't always define
TARGET_SYSTEM_ROOT. * configure: Regenerated. * gcc.c: Check whether
TARGET_SYSTEM_ROOT is defined.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@63793 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 6 ++++++
gcc/configure | 2 +-
gcc/configure.in | 2 +-
gcc/gcc.c | 4 ++++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e4bdb0e3d8e9..4bb936d22398 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-04 Daniel Jacobowitz <drow@mvista.com>
+
+ * configure.in: Don't always define TARGET_SYSTEM_ROOT.
+ * configure: Regenerated.
+ * gcc.c: Check whether TARGET_SYSTEM_ROOT is defined.
+
2003-03-04 Andreas Jaeger <aj@suse.de>
* configure.in: Check for <memcheck.h>.
diff --git a/gcc/configure b/gcc/configure
index 92921cf738fc..fe71c2a63c6a 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -2376,7 +2376,7 @@ if test "${with_sysroot+set}" = set; then
else
TARGET_SYSTEM_ROOT=
- TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=0'
+ TARGET_SYSTEM_ROOT_DEFINE=
CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include'
fi
diff --git a/gcc/configure.in b/gcc/configure.in
index 3e8e1b246667..fa9cab394b09 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -574,7 +574,7 @@ AC_ARG_WITH(sysroot,
esac
], [
TARGET_SYSTEM_ROOT=
- TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=0'
+ TARGET_SYSTEM_ROOT_DEFINE=
CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include'
])
AC_SUBST(TARGET_SYSTEM_ROOT)
diff --git a/gcc/gcc.c b/gcc/gcc.c
index a07bd9c6f8ac..a73985a3e6de 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -202,7 +202,11 @@ static int report_times;
/* Nonzero means place this string before uses of /, so that include
and library files can be found in an alternate location. */
+#ifdef TARGET_SYSTEM_ROOT
static const char *target_system_root = TARGET_SYSTEM_ROOT;
+#else
+static const char *target_system_root = 0;
+#endif
/* Nonzero means pass the updated target_system_root to the compiler. */
--
GitLab