Fix the ${WRAP} -> $${WRAP} to allow static non-libtool linking again

This commit is contained in:
Ondřej Surý
2019-07-31 16:09:43 +02:00
parent 4302b4f3c4
commit 37cccbab8d
3 changed files with 19 additions and 26 deletions

15
configure vendored
View File

@@ -21467,7 +21467,6 @@ fi
LD_WRAP_TESTS=false
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker support for --wrap option" >&5
$as_echo_n "checking for linker support for --wrap option... " >&6; }
if test "$use_libtool" = yes; then :
CCASFLAGS_wrap_ax_save_flags=$CCASFLAGS
@@ -21538,12 +21537,12 @@ if test "$use_libtool" = yes; then :
LDFLAGS="-Wl,-wrap,exit"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
LDFLAGS="-Wl,-wrap,exit"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
void __real_exit (int status);
void __wrap_exit (int status) { __real_exit (status); }
void __real_exit (int status);
void __wrap_exit (int status) { __real_exit (status); }
int
main ()
@@ -21558,7 +21557,7 @@ if ac_fn_c_try_link "$LINENO"; then :
$as_echo "#define LD_WRAP 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -21619,10 +21618,6 @@ rm -f core conftest.err conftest.$ac_objext \
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, libtool required" >&5
$as_echo "no, libtool required" >&6; }
fi