diff --git a/configure b/configure
index 401a6e70a5..91ad536823 100755
--- a/configure
+++ b/configure
@@ -22068,13 +22068,7 @@ $as_echo_n "checking for linker support for --wrap option... " >&6; }
 
 
 LDFLAGS="-Wl,--wrap,exit"
-if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 		       void __real_exit (int status);
@@ -22088,7 +22082,7 @@ exit (1);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   LD_WRAP_TESTS=true
 
 $as_echo "#define LD_WRAP 1" >>confdefs.h
@@ -22099,10 +22093,8 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
   CCASFLAGS=$CCASFLAGS_wrap_ax_save_flags
 
diff --git a/configure.ac b/configure.ac
index 4a7c6f967e..4ac045fd93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2254,7 +2254,7 @@ LD_WRAP_TESTS=false
 AC_MSG_CHECKING([for linker support for --wrap option])
 AX_SAVE_FLAGS([wrap])
 LDFLAGS="-Wl,--wrap,exit"
-AC_RUN_IFELSE(
+AC_LINK_IFELSE(
     [AC_LANG_PROGRAM([[#include <stdlib.h>
 		       void __real_exit (int status);
 		       void __wrap_exit (int status) { __real_exit (0); }