From db720d9a74f699c6eac1ae6802d5866c0f55ece1 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 4 Mar 2003 19:44:09 +0000 Subject: [PATCH] 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 --- 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 e4bdb0e3d8e..4bb936d2239 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-03-04 Daniel Jacobowitz + + * 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 * configure.in: Check for . diff --git a/gcc/configure b/gcc/configure index 92921cf738f..fe71c2a63c6 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 3e8e1b24666..fa9cab394b0 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 a07bd9c6f8a..a73985a3e6d 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. */