aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2007-03-10 16:43:55 +0000
committerJoseph Myers <jsm28@gcc.gnu.org>2007-03-10 16:43:55 +0000
commitc9ecbf8693d49366eeccfe1e0c0f9da5052550d5 (patch)
tree5e347c637b7d5a15816d74f4f5af51a761821a19 /gcc
parent79cd820a29e05b45f5f58d9fd77917eb39b689f6 (diff)
downloadgcc-c9ecbf8693d49366eeccfe1e0c0f9da5052550d5.zip
gcc-c9ecbf8693d49366eeccfe1e0c0f9da5052550d5.tar.gz
gcc-c9ecbf8693d49366eeccfe1e0c0f9da5052550d5.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rwxr-xr-xgcc/configure4
-rw-r--r--gcc/configure.ac4
3 files changed, 14 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 497177e..e94a5a5 100644
--- 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 15e9b31..15a4e05 100755
--- 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 2a0c86c..ed5fb20 100644
--- 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