diff options
| author | Matthias Klose <doko@ubuntu.com> | 2010-01-31 15:01:53 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2010-01-31 15:01:53 +0000 |
| commit | b0a69d2062d2e866c74d47d6b7e44ded0eee9826 (patch) | |
| tree | 00be598078fe94e9287197e695aab0b06c496b06 | |
| parent | 888c5ad25a5d143a2200e71380daa1b404efb754 (diff) | |
| download | gcc-b0a69d2062d2e866c74d47d6b7e44ded0eee9826.zip gcc-b0a69d2062d2e866c74d47d6b7e44ded0eee9826.tar.gz gcc-b0a69d2062d2e866c74d47d6b7e44ded0eee9826.tar.bz2 | |
configure.ac: Fix __stack_chk_fail check for cross builds configured --with-headers
2010-01-31 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix __stack_chk_fail check for cross builds configured
--with-headers
* configure: Regenerate.
From-SVN: r156402
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 4 | ||||
| -rw-r--r-- | gcc/configure.ac | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 670344d..b283f28 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-01-31 Matthias Klose <doko@ubuntu.com> + + * configure.ac: Fix __stack_chk_fail check for cross builds configured + --with-headers + * configure: Regenerate. + 2010-01-29 Eric Botcazou <ebotcazou@adacore.com> * tree-ssa-alias.c (same_type_for_tbaa): Return -1 if the types have diff --git a/gcc/configure b/gcc/configure index 589c8b4..4fc3b10 100755 --- a/gcc/configure +++ b/gcc/configure @@ -24570,7 +24570,9 @@ else case "$target" in *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then - if test "x$with_sysroot" = x; then + if test "x$with_headers" != x; then + glibc_header_dir=$with_headers + elif 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" diff --git a/gcc/configure.ac b/gcc/configure.ac index 0d507e9..b75cc76 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -3853,7 +3853,9 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library, case "$target" in *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then - if test "x$with_sysroot" = x; then + if test "x$with_headers" != x; then + glibc_header_dir=$with_headers + elif 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" |