Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Feb 2024 21:10:13 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 82bebc793658 - main - rescue: Don't explicitly link with libsys
Message-ID:  <202402072110.417LAD63063008@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=82bebc7936581e9c4ff3604d4cb998f8cc017f50

commit 82bebc7936581e9c4ff3604d4cb998f8cc017f50
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-02-07 19:58:33 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-02-07 21:06:20 +0000

    rescue: Don't explicitly link with libsys
    
    libpthread contains the symbols we need when statically linked.  This
    was a leftover from a prior version of ef9871c6205c that I failed to
    remove before I pushed.
    
    Reviewed by:    imp
    Differential Revision:  https://reviews.freebsd.org/D43782
---
 rescue/rescue/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 76810a903856..7bf3299f4d48 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -142,7 +142,7 @@ CRUNCH_PROGS_usr.sbin+= zdb
 
 CRUNCH_LIBS+= -l80211 -lalias -lcam -lncursesw -ldevstat -lipsec -llzma
 .if ${MK_ZFS} != "no"
-CRUNCH_LIBS+= -lavl -lpthread -lsys -luutil -lumem -ltpool -lspl -lrt
+CRUNCH_LIBS+= -lavl -lpthread -luutil -lumem -ltpool -lspl -lrt
 CRUNCH_LIBS_zfs+=	${LIBBE} \
 			${LIBZPOOL} \
 			${LIBZFS} \
@@ -156,7 +156,7 @@ CRUNCH_LIBS_zpool+=	${CRUNCH_LIBS_zfs}
 CRUNCH_LIBS_zdb+=	${CRUNCH_LIBS_zfs}
 .else
 # liblzma needs pthread
-CRUNCH_LIBS+= -lpthread -lsys
+CRUNCH_LIBS+= -lpthread
 .endif
 CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv
 .if ${MK_OPENSSL} == "no"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402072110.417LAD63063008>