Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 May 2024 20:11:17 GMT
From:      Jessica Clarke <jrtc27@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: b2d59a3afb7c - stable/14 - kldxref: Fix bootstrapping on macOS with Clang 16 / Apple Clang 15
Message-ID:  <202405022011.442KBHtL070123@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by jrtc27:

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

commit b2d59a3afb7c3734eed7fa5a809d1326f096f80c
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2024-03-16 01:50:21 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2024-05-02 20:10:13 +0000

    kldxref: Fix bootstrapping on macOS with Clang 16 / Apple Clang 15
    
    macOS, like Linux, does not include an outer const qualifier for its
    fts_open callback arguments, so -Wincompatible-function-pointer-types
    also picks this up and breaks the build now Clang 16 makes it an error
    by default. Extend the existing Linux support to fix this.
    
    MFC after:      1 week
    
    (cherry picked from commit 75464941dc17876af2e99ea90c687bd7df873d73)
---
 usr.sbin/kldxref/kldxref.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c
index 1694f069564b..38f4e87f6ed9 100644
--- a/usr.sbin/kldxref/kldxref.c
+++ b/usr.sbin/kldxref/kldxref.c
@@ -748,7 +748,7 @@ usage(void)
 }
 
 static int
-#ifdef __GLIBC__
+#if defined(__GLIBC__) || defined(__APPLE__)
 compare(const FTSENT **a, const FTSENT **b)
 #else
 compare(const FTSENT *const *a, const FTSENT *const *b)



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