From 6bae8917020ea9cda457ad4625eb1715719ae3c0 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 26 May 2020 17:50:19 +0200
Subject: [PATCH] Don't add linker flags with the emscripten target

Regen
---
 configure    | 10 +++++++---
 configure.ac |  8 +++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 86607b0d..ff2df66d 100755
--- a/configure
+++ b/configure
@@ -8816,7 +8816,9 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,relro" >&5
+if test "x$EMSCRIPTEN" = "x"; 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
@@ -8852,7 +8854,7 @@ else
   :
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,now" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,now" >&5
 $as_echo_n "checking whether the linker accepts -Wl,-z,now... " >&6; }
 if ${ax_cv_check_ldflags___Wl__z_now+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -8888,7 +8890,7 @@ else
   :
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,noexecstack" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,noexecstack" >&5
 $as_echo_n "checking whether the linker accepts -Wl,-z,noexecstack... " >&6; }
 if ${ax_cv_check_ldflags___Wl__z_noexecstack+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -8925,6 +8927,8 @@ else
 fi
 
 
+fi
+
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether segmentation violations can be caught when using the C compiler" >&5
 $as_echo_n "checking whether segmentation violations can be caught when using the C compiler... " >&6; }
diff --git a/configure.ac b/configure.ac
index 912091b4..efc18add 100644
--- a/configure.ac
+++ b/configure.ac
@@ -358,9 +358,11 @@ AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wswitch-enum], [CWFLAGS="$CWFLAGS -Wswitch-enum
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wvariable-decl], [CWFLAGS="$CWFLAGS -Wvariable-decl"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wwrite-strings], [CWFLAGS="$CWFLAGS -Wwrite-strings"])
 
-AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
-AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"])
-AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"])
+AS_IF([test "x$EMSCRIPTEN" = "x"], [
+  AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
+  AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"])
+  AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"])
+])
 
 AX_CHECK_CATCHABLE_SEGV
 AX_CHECK_CATCHABLE_ABRT