From 49076f376af52ac6cb7e8dfaf19766044fedd4d5 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Wed, 7 Feb 2024 19:37:55 +0000 Subject: [PATCH] libc: don't directly link libsys It is sufficent to add it as a filter. Reported by: kib Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D43781 --- lib/libc/Makefile | 1 - share/mk/src.libnames.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 41cf0f6de72a..54748abfeff1 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -62,7 +62,6 @@ CFLAGS+= -ftls-model=initial-exec # LDFLAGS+= -nodefaultlibs LIBADD+= compiler_rt -LIBADD+= sys LDFLAGS+=-Wl,--auxiliary,libsys.so.7 diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 3c19a4c45da3..5a6932614b29 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -393,7 +393,7 @@ _DP_xo= util _DP_ztest= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp # The libc dependencies are not strictly needed but are defined to make the # assert happy. -_DP_c= sys compiler_rt +_DP_c= compiler_rt # Use libssp_nonshared only on i386 and power*. Other archs emit direct calls # to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared. .if ${MK_SSP} != "no" && \