diff options
author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-31 15:01:53 +0000 |
---|---|---|
committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-31 15:01:53 +0000 |
commit | 8b94bf707f7bcb8072978eab232e5b09a22d64cf (patch) | |
tree | 00be598078fe94e9287197e695aab0b06c496b06 /gcc/configure.ac | |
parent | e10fd69618b1633d9b5a4d7a1c104b979cafc39d (diff) | |
download | gcc-8b94bf707f7bcb8072978eab232e5b09a22d64cf.tar.gz |
2010-01-31 Matthias Klose <doko@ubuntu.com>
* configure.ac: Fix __stack_chk_fail check for cross builds configured
--with-headers
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156402 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/configure.ac')
-rw-r--r-- | gcc/configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc/configure.ac b/gcc/configure.ac index 0d507e99b55..b75cc7602b4 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" |