configure.ac | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit bf00789dacf66488cb4f92819acf6953ed96164b
Author: Peter Foley <pefol...@pefoley.com>
Date: Wed Sep 17 21:27:31 2014 -0400
Properly handle the hash-style linker check when cross-compiling
Currently the hash-style check fails when cross-compiling,
use AC_RUN_IFELSE to properly handle this case.
checking for --hash-style gcc linker support ...
./configure: line 12119: ./conftest: cannot execute binary file
Change-Id: I77c2d6a859c1c2e6ba42f31b527a9507127d0644
Reviewed-on: https://gerrit.libreoffice.org/11496
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 499d765..c4367d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4906,16 +4906,17 @@ if test "$GCC" = "yes"; then
hash_style_ldflags_save=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--hash-style=$hash_style"
- AC_LINK_IFELSE([AC_LANG_PROGRAM(
+ AC_RUN_IFELSE([AC_LANG_PROGRAM(
[
#include <stdio.h>
],[
printf ("");
])],
- [ if ./conftest$EXEEXT; then
+ [
HAVE_LD_HASH_STYLE=TRUE
WITH_LINKER_HASH_STYLE=$hash_style
- fi],
+ ],
+ [HAVE_LD_HASH_STYLE=FALSE],
[HAVE_LD_HASH_STYLE=FALSE])
LDFLAGS=$hash_style_ldflags_save
done
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
