From: Mark Wielaard <mjw@redhat.com>
Date: Mon, 14 Jul 2014 12:34:15 +0000 (+0200)
Subject: m4: Handle cross-compile situations in biarch.m4 tests.
X-Git-Tag: elfutils-0.160~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7b2a92bbc10f1f0e31777591fd697e344fbacad;p=thirdparty%2Felfutils.git

m4: Handle cross-compile situations in biarch.m4 tests.

Reported-by: Leonard Crestez <lcrestez@ixiacom.com>
Signed-off-by: Mark Wielaard <mjw@redhat.com>
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index c950e54ba..163ee7346 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-14  Mark Wielaard  <mjw@redhat.com>
+
+	* biarch.m4 (utrace_BIARCH): Set biarch-no for cross-compile using
+	AC_RUN_IFELSE extra argument.
+
 2013-12-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* biarch.m4 (utrace_BIARCH): Call AC_MSG_WARN if !BIARCH.
diff --git a/m4/biarch.m4 b/m4/biarch.m4
index 04c8dbab3..c238d8d1d 100644
--- a/m4/biarch.m4
+++ b/m4/biarch.m4
@@ -40,7 +40,7 @@ AC_CACHE_CHECK([whether $biarch_CC makes executables we can run],
 save_CC="$CC"
 CC="$biarch_CC"
 AC_RUN_IFELSE([AC_LANG_PROGRAM([], [])],
-	      utrace_cv_cc_biarch=yes, utrace_cv_cc_biarch=no)
+	      utrace_cv_cc_biarch=yes, utrace_cv_cc_biarch=no, utrace_cv_cc_biarch=no)
 CC="$save_CC"])], [utrace_cv_cc_biarch=no])
 AS_IF([test $utrace_cv_cc_biarch != yes], [dnl
 AC_MSG_WARN([not running biarch tests, $biarch_CC does not work])])])