# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1621081802 -7200
# Node ID 7b48e331519d61d94ae7c3cfc8f048dada1271b6
# Parent  4bb3aeaba95039573e6ea40e8af40536220141fb
patch 8.2.2852: configure can add --as-needed a second time

Commit: https://github.com/vim/vim/commit/761ead497feff5fd259c9f6ca76d184bb8755373
Author: Natanael Copa <ncopa@alpinelinux.org>
Date:   Sat May 15 14:25:37 2021 +0200

    patch 8.2.2852: configure can add --as-needed a second time

    Problem:    Configure can add --as-needed a second time.
    Solution:   Only add --as-needed if not already there.  (Natanael Copa,
                closes #8189, closes #8181)

diff --git a/src/auto/configure b/src/auto/configure
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14937,7 +14937,9 @@ LDFLAGS=`echo "$LDFLAGS" | sed -e 's/-L 
 LINK_AS_NEEDED=
 # Check if linker supports --as-needed and --no-as-needed options
 if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
-  LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-Wl,--as-needed//g' | sed -e 's/$/ -Wl,--as-needed/'`
+  if ! echo "$LDFLAGS" | grep -q -- '-Wl,[^[:space:]]*--as-needed'; then
+    LDFLAGS="$LDFLAGS -Wl,--as-needed"
+  fi
   LINK_AS_NEEDED=yes
 fi
 if test "$LINK_AS_NEEDED" = yes; then
diff --git a/src/configure.ac b/src/configure.ac
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4519,7 +4519,9 @@ AC_MSG_CHECKING(linker --as-needed suppo
 LINK_AS_NEEDED=
 # Check if linker supports --as-needed and --no-as-needed options
 if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
-  LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-Wl,--as-needed//g' | sed -e 's/$/ -Wl,--as-needed/'`
+  if ! echo "$LDFLAGS" | grep -q -- '-Wl,[[^[:space:]]]*--as-needed'; then
+    LDFLAGS="$LDFLAGS -Wl,--as-needed"
+  fi
   LINK_AS_NEEDED=yes
 fi
 if test "$LINK_AS_NEEDED" = yes; then
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2852,
+/**/
     2851,
 /**/
     2850,