diff options
Diffstat (limited to 'gcc/configure')
| -rwxr-xr-x | gcc/configure | 20 |
1 files changed, 12 insertions, 8 deletions
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 |