File 0938-ts-Fix-configure-on-solaris-to-work-with-stack-guard.patch of Package erlang
From 2af395299195c6e85a14c988669c62bb7f44bff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Backstr=C3=B6m?= <lukas@erlang.org>
Date: Tue, 15 Apr 2025 09:26:58 +0200
Subject: [PATCH 1/2] ts: Fix configure on solaris to work with stack guards
When enabling security hardening the linking command on solaris
needs to be CC and not LD as otherwise the correct options
are not passed to the linker.
---
.../test/process_SUITE_data/Makefile.src | 2 +-
lib/common_test/test_server/conf_vars.in | 1 -
lib/common_test/test_server/configure | 13 ++-----------
lib/common_test/test_server/configure.ac | 12 ++----------
.../test_server/ts_autoconf_win32.erl | 2 --
lib/common_test/test_server/ts_erl_config.erl | 2 +-
lib/erl_interface/src/eidefs.mk.in | 2 ++
lib/erl_interface/test/Makefile.src | 18 +++++++++---------
.../test/ei_accept_SUITE_data/Makefile.src | 4 ++--
.../test/ei_connect_SUITE_data/Makefile.src | 4 ++--
.../test/ei_decode_SUITE_data/Makefile.src | 2 +-
.../ei_decode_encode_SUITE_data/Makefile.src | 2 +-
.../test/ei_encode_SUITE_data/Makefile.src | 2 +-
.../test/ei_format_SUITE_data/Makefile.src | 2 +-
.../test/ei_global_SUITE_data/Makefile.src | 2 +-
.../test/ei_print_SUITE_data/Makefile.src | 2 +-
.../test/ei_tmo_SUITE_data/Makefile.src | 2 +-
lib/kernel/test/erpc_SUITE_data/Makefile.src | 2 +-
18 files changed, 29 insertions(+), 47 deletions(-)
diff --git a/erts/emulator/test/process_SUITE_data/Makefile.src b/erts/emulator/test/process_SUITE_data/Makefile.src
index 7a60ff8c06..00bad3a983 100644
--- a/erts/emulator/test/process_SUITE_data/Makefile.src
+++ b/erts/emulator/test/process_SUITE_data/Makefile.src
@@ -33,7 +33,7 @@ LIBFLAGS = $(LIBEI) @LIBS@ @erl_interface_sock_libs@ @erl_interface_threadlib@
all: fwd_node@exe@
fwd_node@exe@: fwd_node@obj@ $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ fwd_node@obj@ $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ fwd_node@obj@ $(LIBFLAGS)
clean:
$(RM) fwd_node@obj@
diff --git a/lib/common_test/test_server/conf_vars.in b/lib/common_test/test_server/conf_vars.in
index 2d1e78fc69..fd05dac604 100644
--- a/lib/common_test/test_server/conf_vars.in
+++ b/lib/common_test/test_server/conf_vars.in
@@ -8,7 +8,6 @@ SHLIB_LD:@SHLIB_LD@
SHLIB_LDFLAGS:@SHLIB_LDFLAGS@
SHLIB_LDLIBS:@SHLIB_LDLIBS@
SHLIB_CFLAGS:@SHLIB_CFLAGS@
-SHLIB_EXTRACT_ALL:@SHLIB_EXTRACT_ALL@
dll:@SHLIB_SUFFIX@
DEFS:@DEFS@
ERTS_LIBS:@ERTS_LIBS@
diff --git a/lib/common_test/test_server/configure b/lib/common_test/test_server/configure
index b3a8b2e698..f7dbdfcb3c 100755
--- a/lib/common_test/test_server/configure
+++ b/lib/common_test/test_server/configure
@@ -654,7 +654,6 @@ HCC
ERTS_LIBS
ERTS_CFLAGS
EI_CFLAGS
-SHLIB_EXTRACT_ALL
SHLIB_SUFFIX
SHLIB_CFLAGS
SHLIB_LDLIBS
@@ -4131,7 +4130,6 @@ fi
as_fn_error $? "don't know how to link 32-bit dynamic drivers" "$LINENO" 5
fi
fi
- SHLIB_EXTRACT_ALL=""
;; #(
*-openbsd*|*-netbsd*|*-freebsd*|*-dragonfly*) :
@@ -4163,13 +4161,12 @@ else case e in #(
fi
- SHLIB_EXTRACT_ALL=""
;; #(
*-solaris2*|*-sysv4*) :
SHLIB_CFLAGS="-KPIC"
- SHLIB_LD="/usr/ccs/bin/ld"
- SHLIB_LDFLAGS="$no_mXX_LDFLAGS -G -z text"
+ SHLIB_LD="${CC}"
+ SHLIB_LDFLAGS="$no_mXX_LDFLAGS -G -Wl,-z,text"
if test X${enable_m64_build} = Xyes; then
SHLIB_LDFLAGS="-64 $SHLIB_LDFLAGS"
fi
@@ -4177,7 +4174,6 @@ fi
as_fn_error $? "don't know how to link 32-bit dynamic drivers" "$LINENO" 5
fi
SHLIB_SUFFIX=".so"
- SHLIB_EXTRACT_ALL="-z allextract"
;; #(
*darwin*) :
@@ -4185,7 +4181,6 @@ fi
SHLIB_LD="cc"
SHLIB_LDFLAGS="$LDFLAGS -bundle -flat_namespace -undefined suppress"
SHLIB_SUFFIX=".so"
- SHLIB_EXTRACT_ALL=""
;; #(
*osf1*) :
@@ -4199,7 +4194,6 @@ fi
as_fn_error $? "don't know how to link 32-bit dynamic drivers" "$LINENO" 5
fi
SHLIB_SUFFIX=".so"
- SHLIB_EXTRACT_ALL=""
;; #(
*osf5*) :
@@ -4207,7 +4201,6 @@ fi
SHLIB_LD="${CC} -shared"
SHLIB_LDFLAGS="$LDFLAGS"
SHLIB_SUFFIX=".so"
- SHLIB_EXTRACT_ALL=""
;; #(
*) :
@@ -4217,7 +4210,6 @@ fi
SHLIB_LDFLAGS=""
SHLIB_LDLIBS=""
SHLIB_SUFFIX=""
- SHLIB_EXTRACT_ALL=""
as_fn_error $? "don't know how to compile and link dynamic drivers" "$LINENO" 5
;;
esac
@@ -4275,7 +4267,6 @@ SHLIB_CFLAGS="$SHLIB_CFLAGS $CFLAGS"
-
#--------------------------------------------------------------------
# Check for the existence of the -lsocket and -lnsl libraries.
# The order here is important, so that they end up in the right
diff --git a/lib/common_test/test_server/configure.ac b/lib/common_test/test_server/configure.ac
index 1685e60c46..2f5b959c19 100644
--- a/lib/common_test/test_server/configure.ac
+++ b/lib/common_test/test_server/configure.ac
@@ -175,7 +175,6 @@ AS_CASE([$system],
AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
fi
fi
- SHLIB_EXTRACT_ALL=""
],
[*-openbsd*|*-netbsd*|*-freebsd*|*-dragonfly*],
@@ -200,14 +199,13 @@ AS_CASE([$system],
SHLIB_SUFFIX=""
AC_MSG_ERROR(don't know how to compile and link dynamic drivers)
])
- SHLIB_EXTRACT_ALL=""
],
[*-solaris2*|*-sysv4*],
[
SHLIB_CFLAGS="-KPIC"
- SHLIB_LD="/usr/ccs/bin/ld"
- SHLIB_LDFLAGS="$no_mXX_LDFLAGS -G -z text"
+ SHLIB_LD="${CC}"
+ SHLIB_LDFLAGS="$no_mXX_LDFLAGS -G -Wl,-z,text"
if test X${enable_m64_build} = Xyes; then
SHLIB_LDFLAGS="-64 $SHLIB_LDFLAGS"
fi
@@ -215,7 +213,6 @@ AS_CASE([$system],
AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
fi
SHLIB_SUFFIX=".so"
- SHLIB_EXTRACT_ALL="-z allextract"
],
[*darwin*],
@@ -224,7 +221,6 @@ AS_CASE([$system],
SHLIB_LD="cc"
SHLIB_LDFLAGS="$LDFLAGS -bundle -flat_namespace -undefined suppress"
SHLIB_SUFFIX=".so"
- SHLIB_EXTRACT_ALL=""
],
[*osf1*],
@@ -239,7 +235,6 @@ AS_CASE([$system],
AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
fi
SHLIB_SUFFIX=".so"
- SHLIB_EXTRACT_ALL=""
],
[*osf5*],
@@ -248,7 +243,6 @@ AS_CASE([$system],
SHLIB_LD="${CC} -shared"
SHLIB_LDFLAGS="$LDFLAGS"
SHLIB_SUFFIX=".so"
- SHLIB_EXTRACT_ALL=""
],
[
@@ -258,7 +252,6 @@ AS_CASE([$system],
SHLIB_LDFLAGS=""
SHLIB_LDLIBS=""
SHLIB_SUFFIX=""
- SHLIB_EXTRACT_ALL=""
AC_MSG_ERROR(don't know how to compile and link dynamic drivers)
])
@@ -310,7 +303,6 @@ AC_SUBST(SHLIB_LDFLAGS)
AC_SUBST(SHLIB_LDLIBS)
AC_SUBST(SHLIB_CFLAGS)
AC_SUBST(SHLIB_SUFFIX)
-AC_SUBST(SHLIB_EXTRACT_ALL)
AC_SUBST(EI_CFLAGS)
#--------------------------------------------------------------------
diff --git a/lib/common_test/test_server/ts_autoconf_win32.erl b/lib/common_test/test_server/ts_autoconf_win32.erl
index 399b8e8347..978e8de4f4 100644
--- a/lib/common_test/test_server/ts_autoconf_win32.erl
+++ b/lib/common_test/test_server/ts_autoconf_win32.erl
@@ -163,7 +163,6 @@ visual_cxx(Vars) ->
{'SHLIB_LD', CC},
{'SHLIB_LDFLAGS', ERTS_THR_LIB ++ DLL},
{'SHLIB_LDLIBS', DBG_LINK ++ "kernel32.lib"},
- {'SHLIB_EXTRACT_ALL', ""},
{'CFLAGS', DEFAULT_THR_LIB ++ WIN32 ++ DBG_COMP},
{'EI_CFLAGS', DEFAULT_THR_LIB ++ WIN32 ++ DBG_COMP},
{'ERTS_CFLAGS', ERTS_CFLAGS},
@@ -204,7 +203,6 @@ mingw32(Vars) ->
{'SHLIB_LD', CC},
{'SHLIB_LDFLAGS', "-shared "},
{'SHLIB_LDLIBS', " -lkernel32"},
- {'SHLIB_EXTRACT_ALL', ""},
{'CFLAGS', WIN32 ++ DBG_COMP},
{'EI_CFLAGS', WIN32 ++ DBG_COMP},
{'ERTS_CFLAGS', ERTS_CFLAGS},
diff --git a/lib/common_test/test_server/ts_erl_config.erl b/lib/common_test/test_server/ts_erl_config.erl
index c72db4227e..0485b666e2 100644
--- a/lib/common_test/test_server/ts_erl_config.erl
+++ b/lib/common_test/test_server/ts_erl_config.erl
@@ -68,7 +68,7 @@ dl_vars(Vars, Base3, OsType) ->
".SUFFIXES: @dll@ @obj@ .c\n\n" ++
".c@dll@:\n" ++
"\t@CC@ -c @SHLIB_CFLAGS@ $(SHLIB_EXTRA_CFLAGS) -I@erl_include@ @DEFS@ $<\n" ++
- "\t@SHLIB_LD@ @CROSSLDFLAGS@ @SHLIB_LDFLAGS@ $(SHLIB_EXTRA_LDFLAGS) -o $@ $*@obj@ @SHLIB_LDLIBS@ $(SHLIB_EXTRA_LDLIBS)",
+ "\t@SHLIB_LD@ $(EI_LDFLAGS) @CROSSLDFLAGS@ @SHLIB_LDFLAGS@ $(SHLIB_EXTRA_LDFLAGS) -o $@ $*@obj@ @SHLIB_LDLIBS@ $(SHLIB_EXTRA_LDLIBS)",
ShlibRules = ts_lib:subst(ShlibRules0, Vars),
case get_app_vars2(fun jinterface/2, Base3, OsType) of
diff --git a/lib/erl_interface/src/eidefs.mk.in b/lib/erl_interface/src/eidefs.mk.in
index e8898f6d3d..569a3fb7f6 100644
--- a/lib/erl_interface/src/eidefs.mk.in
+++ b/lib/erl_interface/src/eidefs.mk.in
@@ -31,4 +31,6 @@ THR_DEFS=@THR_DEFS@
# Threads libs
THR_LIBS=@THR_LIBS@
+EI_LDFLAGS=@LDFLAGS@
+
# ----------------------------------------------------------------------
diff --git a/lib/erl_interface/test/Makefile.src b/lib/erl_interface/test/Makefile.src
index b0c930f2c5..720b0f148b 100644
--- a/lib/erl_interface/test/Makefile.src
+++ b/lib/erl_interface/test/Makefile.src
@@ -47,28 +47,28 @@ PROGS = eterm_test@exe@ format_test@exe@ print_term@exe@ match_test@exe@ ei_form
all: $(PROGS)
eterm_test@exe@: $(ETERM_OBJS) $(LIBERL) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o eterm_test $(ETERM_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o eterm_test $(ETERM_OBJS) $(LIBFLAGS)
ext_test@exe@: $(EXT_OBJS) $(LIBERL) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o ext_test $(EXT_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o ext_test $(EXT_OBJS) $(LIBFLAGS)
format_test@exe@: $(FORMAT_OBJS) $(LIBERL) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o format_test $(FORMAT_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o format_test $(FORMAT_OBJS) $(LIBFLAGS)
ei_format_test@exe@: $(EI_FORMAT_OBJS) $(LIBERL) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o ei_format_test $(EI_FORMAT_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o ei_format_test $(EI_FORMAT_OBJS) $(LIBFLAGS)
ei_print_test@exe@: $(EI_PRINT_OBJS) $(LIBERL) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o ei_print_test $(EI_PRINT_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o ei_print_test $(EI_PRINT_OBJS) $(LIBFLAGS)
ei_connect_test@exe@: $(EI_CONNECT_OBJS) $(LIBERL) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o ei_connect_test $(EI_CONNECT_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o ei_connect_test $(EI_CONNECT_OBJS) $(LIBFLAGS)
ei_accept_test@exe@: $(EI_ACCEPT_OBJS) $(LIBERL) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o ei_accept_test $(EI_ACCEPT_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o ei_accept_test $(EI_ACCEPT_OBJS) $(LIBFLAGS)
match_test@exe@: $(MATCH_OBJS) $(LIBERL) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o match_test $(MATCH_OBJS) $(LIBFLGAS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o match_test $(MATCH_OBJS) $(LIBFLGAS)
print_term@exe@: print_term@obj@ $(LIBERL) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o print_term print_term@obj@ $(LIBFLGAS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o print_term print_term@obj@ $(LIBFLGAS)
diff --git a/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src
index 75900e915d..575021dec6 100644
--- a/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src
@@ -41,8 +41,8 @@ clean:
$(RM) ei_accept_test@exe@ eiaccnode@exe@
ei_accept_test@exe@: $(EI_ACCEPT_OBJS) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ $(EI_ACCEPT_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ $(EI_ACCEPT_OBJS) $(LIBFLAGS)
eiaccnode@exe@: $(EIACCNODE_OBJS) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ $(EIACCNODE_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ $(EIACCNODE_OBJS) $(LIBFLAGS)
diff --git a/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src
index 2c028eeaab..c26114713f 100644
--- a/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src
@@ -40,10 +40,10 @@ clean:
$(RM) ei_connect_test@exe@ einode@exe@
ei_connect_test@exe@: $(EI_CONNECT_OBJS) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ $(EI_CONNECT_OBJS) \
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ $(EI_CONNECT_OBJS) \
../all_SUITE_data/my_ussi@obj@ $(LIBFLAGS)
einode@exe@: $(EINODE_OBJS) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ $(EINODE_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ $(EINODE_OBJS) $(LIBFLAGS)
diff --git a/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src
index aaeeab587a..60259bf4ca 100644
--- a/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src
@@ -39,6 +39,6 @@ clean:
$(RM) ei_decode_test@exe@
ei_decode_test@exe@: $(EI_DECODE_OBJS) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ $(EI_DECODE_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ $(EI_DECODE_OBJS) $(LIBFLAGS)
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src
index 492f76da31..8486e547a2 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src
@@ -39,6 +39,6 @@ clean:
$(RM) ei_decode_encode_test@exe@
ei_decode_encode_test@exe@: $(EI_DECODE_ENCODE_OBJS) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ $(EI_DECODE_ENCODE_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ $(EI_DECODE_ENCODE_OBJS) $(LIBFLAGS)
diff --git a/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src
index caef50e8d9..92a7462caf 100644
--- a/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src
@@ -39,6 +39,6 @@ clean:
$(RM) ei_encode_test@exe@
ei_encode_test@exe@: $(EI_ENCODE_OBJS) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ $(EI_ENCODE_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ $(EI_ENCODE_OBJS) $(LIBFLAGS)
diff --git a/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src
index aec26b7130..03ef86e4c6 100644
--- a/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src
@@ -39,6 +39,6 @@ clean:
$(RM) ei_format_test@exe@
ei_format_test@exe@: $(EI_FORMAT_OBJS) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ $(EI_FORMAT_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ $(EI_FORMAT_OBJS) $(LIBFLAGS)
diff --git a/lib/erl_interface/test/ei_global_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_global_SUITE_data/Makefile.src
index cf557ecc90..5c5a9c0259 100644
--- a/lib/erl_interface/test/ei_global_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_global_SUITE_data/Makefile.src
@@ -40,5 +40,5 @@ clean:
$(RM) ei_global_test@exe@
ei_global_test@exe@: $(EI_GLOBAL_OBJS) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ $(EI_GLOBAL_OBJS) \
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ $(EI_GLOBAL_OBJS) \
../all_SUITE_data/my_ussi@obj@ $(LIBFLAGS)
diff --git a/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src
index bea7f6cc8a..ad9cef91dd 100644
--- a/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src
@@ -39,6 +39,6 @@ clean:
$(RM) ei_print_test@exe@
ei_print_test@exe@: $(EI_PRINT_OBJS) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ $(EI_PRINT_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ $(EI_PRINT_OBJS) $(LIBFLAGS)
diff --git a/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src
index cc117a1630..adacae6d10 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src
@@ -40,5 +40,5 @@ clean:
$(RM) ei_tmo_test@exe@
ei_tmo_test@exe@: $(EI_TMO_OBJS) $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ $(EI_TMO_OBJS) $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ $(EI_TMO_OBJS) $(LIBFLAGS)
diff --git a/lib/kernel/test/erpc_SUITE_data/Makefile.src b/lib/kernel/test/erpc_SUITE_data/Makefile.src
index 7a60ff8c06..00bad3a983 100644
--- a/lib/kernel/test/erpc_SUITE_data/Makefile.src
+++ b/lib/kernel/test/erpc_SUITE_data/Makefile.src
@@ -33,7 +33,7 @@ LIBFLAGS = $(LIBEI) @LIBS@ @erl_interface_sock_libs@ @erl_interface_threadlib@
all: fwd_node@exe@
fwd_node@exe@: fwd_node@obj@ $(LIBEI)
- $(LD) @CROSSLDFLAGS@ -o $@ fwd_node@obj@ $(LIBFLAGS)
+ $(LD) $(EI_LDFLAGS) @CROSSLDFLAGS@ -o $@ fwd_node@obj@ $(LIBFLAGS)
clean:
$(RM) fwd_node@obj@
--
2.43.0
