diff --git a/configure b/configure
index 0cc73e4e66552d..43ff19e19f8d40 100755
--- a/configure
+++ b/configure
@@ -9726,7 +9726,7 @@ fi
 printf "%s\n" "$ax_cv_check_cflags__Werror__fstack_protector_strong" >&6; }
 if test "x$ax_cv_check_cflags__Werror__fstack_protector_strong" = xyes
 then :
-  CFLAGS_NODIST="$CFLAGS_NODIST -fstack-protector-strong"
+  CFLAGS_NODIST="$CFLAGS_NODIST -fstack-protector-strong" LDFLAGS="$LDFLAGS -fstack-protector-strong"
 else $as_nop
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: -fstack-protector-strong not supported" >&5
 printf "%s\n" "$as_me: WARNING: -fstack-protector-strong not supported" >&2;}
diff --git a/configure.ac b/configure.ac
index 1864e94ace9243..5b3386fcb2034f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2512,7 +2512,7 @@ AC_MSG_RESULT([$enable_safety])
 
 if test "$enable_safety" = "yes"
 then
-  AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [CFLAGS_NODIST="$CFLAGS_NODIST -fstack-protector-strong"], [AC_MSG_WARN([-fstack-protector-strong not supported])], [-Werror])
+  AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [CFLAGS_NODIST="$CFLAGS_NODIST -fstack-protector-strong" LDFLAGS="$LDFLAGS -fstack-protector-strong"], [AC_MSG_WARN([-fstack-protector-strong not supported])], [-Werror])
   AX_CHECK_COMPILE_FLAG([-Wtrampolines], [CFLAGS_NODIST="$CFLAGS_NODIST -Wtrampolines"], [AC_MSG_WARN([-Wtrampolines not supported])], [-Werror])
   AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough], [CFLAGS_NODIST="$CFLAGS_NODIST -Wimplicit-fallthrough"], [AC_MSG_WARN([-Wimplicit-fallthrough not supported])], [-Werror])
   AX_CHECK_COMPILE_FLAG([-Werror=format-security], [CFLAGS_NODIST="$CFLAGS_NODIST -Werror=format-security"], [AC_MSG_WARN([-Werror=format-security not supported])], [-Werror])