diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2005-07-29 19:29:13 +0000 |
|---|---|---|
| committer | Mark Mitchell <mark@codesourcery.com> | 2005-07-29 19:29:13 +0000 |
| commit | 94803096aebfb76e3b8083d40e9465e98162e561 (patch) | |
| tree | 74e0344476afb8b27de66abca82d5dee2b758800 | |
| parent | f605cec147cb5797f0fa93a2c5b2b6b8cd58b633 (diff) | |
Backport:
2005-07-29 Mark Mitchell <mark@codesourcery.com>
PR bootstrap/23131
* configure.ac (SYSTEM_HEADER_DIR): Avoid setting to empty
string.
* configure: Regenerated.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/csl-3_4_3-linux-branch@102563 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog.csl | 9 | ||||
| -rwxr-xr-x | gcc/configure | 20 | ||||
| -rw-r--r-- | gcc/configure.ac | 20 |
3 files changed, 33 insertions, 16 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index c9449c33980..62fff89fb40 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,12 @@ +2005-07-29 Mark Mitchell <mark@codesourcery.com> + + Backport: + 2005-07-29 Mark Mitchell <mark@codesourcery.com> + PR bootstrap/23131 + * configure.ac (SYSTEM_HEADER_DIR): Avoid setting to empty + string. + * configure: Regenerated. + 2005-07-27 Mark Mitchell <mark@codesourcery.com> Backport: diff --git a/gcc/configure b/gcc/configure index 4663b9d7c2e..45de55723f3 100755 --- a/gcc/configure +++ b/gcc/configure @@ -4776,11 +4776,6 @@ if test "${with_sysroot+set}" = set; then TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR)' - if test "x$with_build_sysroot" != x; then - build_system_header_dir=$with_build_sysroot'$(NATIVE_SYSTEM_HEADER_DIR)' - else - build_system_header_dir='$(CROSS_SYSTEM_HEADER_DIR)' - fi if test "x$exec_prefix" = xNONE; then if test "x$prefix" = xNONE; then @@ -5243,7 +5238,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then else ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` - echo "configure:5246: version of makeinfo is $ac_prog_version" >&5 + echo "configure:5241: version of makeinfo is $ac_prog_version" >&5 case $ac_prog_version in '') gcc_cv_prog_makeinfo_modern=no;; 4.[2-9]*) @@ -9865,6 +9860,16 @@ done CROSS= ALL=all.internal SYSTEM_HEADER_DIR='$(NATIVE_SYSTEM_HEADER_DIR)' + +if test "x$with_build_sysroot" != x; then + build_system_header_dir=$with_build_sysroot'$(NATIVE_SYSTEM_HEADER_DIR)' +else + # This value is used, even on a native system, because + # CROSS_SYSTEM_HEADER_DIR is just + # $(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR). + build_system_header_dir='$(CROSS_SYSTEM_HEADER_DIR)' +fi + if test x$host != x$target then CROSS="-DCROSS_COMPILE" @@ -9891,8 +9896,7 @@ then CROSS="$CROSS -DNATIVE_CROSS" ;; esac elif test "x$TARGET_SYSTEM_ROOT" != x; then - # This is just $(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR) - SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)' + SYSTEM_HEADER_DIR=$build_system_header_dir fi # If this is a cross-compiler that does not diff --git a/gcc/configure.ac b/gcc/configure.ac index 811caefa5c9..778e27f5043 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -581,12 +581,7 @@ AC_ARG_WITH(sysroot, TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR)' - if test "x$with_build_sysroot" != x; then - build_system_header_dir=$with_build_sysroot'$(NATIVE_SYSTEM_HEADER_DIR)' - else - build_system_header_dir='$(CROSS_SYSTEM_HEADER_DIR)' - fi - + if test "x$exec_prefix" = xNONE; then if test "x$prefix" = xNONE; then test_prefix=/usr/local @@ -1467,6 +1462,16 @@ done CROSS= AC_SUBST(CROSS) ALL=all.internal AC_SUBST(ALL) SYSTEM_HEADER_DIR='$(NATIVE_SYSTEM_HEADER_DIR)' AC_SUBST(SYSTEM_HEADER_DIR) + +if test "x$with_build_sysroot" != x; then + build_system_header_dir=$with_build_sysroot'$(NATIVE_SYSTEM_HEADER_DIR)' +else + # This value is used, even on a native system, because + # CROSS_SYSTEM_HEADER_DIR is just + # $(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR). + build_system_header_dir='$(CROSS_SYSTEM_HEADER_DIR)' +fi + if test x$host != x$target then CROSS="-DCROSS_COMPILE" @@ -1493,8 +1498,7 @@ then CROSS="$CROSS -DNATIVE_CROSS" ;; esac elif test "x$TARGET_SYSTEM_ROOT" != x; then - # This is just $(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR) - SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)' + SYSTEM_HEADER_DIR=$build_system_header_dir fi # If this is a cross-compiler that does not |