From 4e75061c4da3d5d755fb82393db30ae0579fc02e Mon Sep 17 00:00:00 2001
From: Dapeng Gao <dapeng.gao@cl.cam.ac.uk>
Date: Sun, 17 Mar 2024 22:44:19 +0000
Subject: [PATCH] cheribsdtest: Use elfctl to enable c18n

---
 bin/cheribsdtest/Makefile.cheribsdtest | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bin/cheribsdtest/Makefile.cheribsdtest b/bin/cheribsdtest/Makefile.cheribsdtest
index 1611aa4b8cfc..8880faae2752 100644
--- a/bin/cheribsdtest/Makefile.cheribsdtest
+++ b/bin/cheribsdtest/Makefile.cheribsdtest
@@ -90,11 +90,7 @@ SRCS+=		cheribsdtest_tls_threads.c
 
 .ifdef CHERIBSD_C18N_TESTS
 CFLAGS+=	-DCHERIBSD_C18N_TESTS
-.if ${MACHINE_ABI:Mbenchmark}
-LDFLAGS+=	-Wl,--dynamic-linker=/libexec/ld-elf64cb-c18n.so.1
-.else
-LDFLAGS+=	-Wl,--dynamic-linker=/libexec/ld-elf-c18n.so.1
-.endif
+ELF_FEATURES+=	+cheric18n
 .endif
 
 .include <bsd.prog.mk>