From: Todd C. Miller Date: Tue, 22 May 2012 19:46:00 +0000 (-0400) Subject: Fix test for -z relro X-Git-Tag: SUDO_1_7_10~109 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e29dc95bbc085431ec6b333745fbf9547b607d12;p=sudo Fix test for -z relro --HG-- branch : 1.7 --- diff --git a/configure b/configure index 8bf95e618..35ac56592 100755 --- a/configure +++ b/configure @@ -14624,14 +14624,14 @@ else : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,z,relro" >&5 -$as_echo_n "checking whether the linker accepts -Wl,z,relro... " >&6; } -if ${ax_cv_check_ldflags___Wl_z_relro+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,relro" >&5 +$as_echo_n "checking whether the linker accepts -Wl,-z,relro... " >&6; } +if ${ax_cv_check_ldflags___Wl__z_relro+:} false; then : $as_echo_n "(cached) " >&6 else ax_check_save_flags=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,z,relro" + LDFLAGS="$LDFLAGS -Wl,-z,relro" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14644,18 +14644,18 @@ main () } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ax_cv_check_ldflags___Wl_z_relro=yes + ax_cv_check_ldflags___Wl__z_relro=yes else - ax_cv_check_ldflags___Wl_z_relro=no + ax_cv_check_ldflags___Wl__z_relro=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$ax_check_save_flags fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl_z_relro" >&5 -$as_echo "$ax_cv_check_ldflags___Wl_z_relro" >&6; } -if test x"$ax_cv_check_ldflags___Wl_z_relro" = xyes; then : - LDFLAGS="${LDFLAGS} -Wl,z,relro" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl__z_relro" >&5 +$as_echo "$ax_cv_check_ldflags___Wl__z_relro" >&6; } +if test x"$ax_cv_check_ldflags___Wl__z_relro" = xyes; then : + LDFLAGS="${LDFLAGS} -Wl,-z,relro" else : fi diff --git a/configure.in b/configure.in index 56799bd50..46cb47834 100644 --- a/configure.in +++ b/configure.in @@ -1910,7 +1910,7 @@ dnl if test "$enable_hardening" != "no"; then AX_CHECK_COMPILE_FLAG([-fstack-protector], [CFLAGS="${CFLAGS} -fstack-protector"]) AX_CHECK_LINK_FLAG([-fstack-protector], [LDFLAGS="${LDFLAGS} -fstack-protector"]) - AX_CHECK_LINK_FLAG([-Wl,z,relro], [LDFLAGS="${LDFLAGS} -Wl,z,relro"]) + AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="${LDFLAGS} -Wl,-z,relro"]) fi dnl