diff options
| author | Mark Wielaard <mjw@redhat.com> | 2014-07-14 14:34:15 +0200 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2014-07-14 14:34:15 +0200 |
| commit | e7b2a92bbc10f1f0e31777591fd697e344fbacad (patch) | |
| tree | b38f0c9fc30b35cb8561b5f382edd1abef74a883 /m4 | |
| parent | a95c4ad24cf83b2b0273fee73162bf476cebec8f (diff) | |
m4: Handle cross-compile situations in biarch.m4 tests.
Reported-by: Leonard Crestez <lcrestez@ixiacom.com>
Signed-off-by: Mark Wielaard <mjw@redhat.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/biarch.m4 | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index c950e54b..163ee734 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 04c8dbab..c238d8d1 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])])]) |