configure.ac (glibc_header_dir): Set using with_build_sysroot if defined.

	* configure.ac (glibc_header_dir): Set using with_build_sysroot if
	defined.
	* configure: Regenerate.

From-SVN: r122795

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 497177eb3e1e14e3bbbdc79cba95456a66663cc0..e94a5a5cbbec90c00608fde0c294b482ce4f7786 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-10  Joseph Myers  <joseph@codesourcery.com>
+
+       * configure.ac (glibc_header_dir): Set using with_build_sysroot if
+       defined.
+       * configure: Regenerate.
+
 2007-03-10  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/31101

diff --git a/gcc/configure b/gcc/configure
index 15e9b31d917f5432f39511d0ab9df5ebce724275..15a4e05b31a27c3690aca62355bd4baa25c58d9c 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -16309,6 +16309,8 @@ else
       if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
        if test "x$with_sysroot" = x; then
          glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
+       elif test "x$with_build_sysroot" != "x"; then
+         glibc_header_dir="${with_build_sysroot}/usr/include"
        elif test "x$with_sysroot" = xyes; then
          glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
        else
@@ -16463,6 +16465,8 @@ else
       if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
        if test "x$with_sysroot" = x; then
          glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
+       elif test "x$with_build_sysroot" != "x"; then
+         glibc_header_dir="${with_build_sysroot}/usr/include"
        elif test "x$with_sysroot" = xyes; then
          glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
        else

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 2a0c86c0e2164aff9733761746f3654c4bd0ede5..ed5fb203eef207cde9417dc32a5148df6dff6768 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3324,6 +3324,8 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
       if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
        if test "x$with_sysroot" = x; then
          glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
+       elif test "x$with_build_sysroot" != "x"; then
+         glibc_header_dir="${with_build_sysroot}/usr/include"
        elif test "x$with_sysroot" = xyes; then
          glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
        else
@@ -3375,6 +3377,8 @@ case "$target" in
       if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
        if test "x$with_sysroot" = x; then
          glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
+       elif test "x$with_build_sysroot" != "x"; then
+         glibc_header_dir="${with_build_sysroot}/usr/include"
        elif test "x$with_sysroot" = xyes; then
          glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
        else