aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@mvista.com>2003-03-04 19:44:09 +0000
committerDaniel Jacobowitz <drow@gcc.gnu.org>2003-03-04 19:44:09 +0000
commitdb720d9a74f699c6eac1ae6802d5866c0f55ece1 (patch)
tree548c3ff3293af1f129ac36435973500c8293208f
parent9124bc53e9ac82035d2820786e1fa37ef4d9c8a1 (diff)
downloadgcc-db720d9a74f699c6eac1ae6802d5866c0f55ece1.zip
gcc-db720d9a74f699c6eac1ae6802d5866c0f55ece1.tar.gz
gcc-db720d9a74f699c6eac1ae6802d5866c0f55ece1.tar.bz2
configure.in: Don't always define TARGET_SYSTEM_ROOT.
* configure.in: Don't always define TARGET_SYSTEM_ROOT. * configure: Regenerated. * gcc.c: Check whether TARGET_SYSTEM_ROOT is defined. From-SVN: r63793
-rw-r--r--gcc/ChangeLog6
-rwxr-xr-xgcc/configure2
-rw-r--r--gcc/configure.in2
-rw-r--r--gcc/gcc.c4
4 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e4bdb0e..4bb936d 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 92921cf..fe71c2a 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 3e8e1b2..fa9cab3 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 a07bd9c..a73985a 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. */