git: d5c1296234cb - main - spl: Unbreak crossbuild after f20893853e8e

Jessica Clarke jrtc27 at FreeBSD.org
Tue Jun 15 00:23:38 UTC 2021


The branch main has been updated by jrtc27:

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

commit d5c1296234cb8f2077adf61fc43639ecf2e1569b
Author:     Jessica Clarke <jrtc27 at FreeBSD.org>
AuthorDate: 2021-06-15 00:23:04 +0000
Commit:     Jessica Clarke <jrtc27 at FreeBSD.org>
CommitDate: 2021-06-15 00:23:04 +0000

    spl: Unbreak crossbuild after f20893853e8e
    
    Summary:
    f20893853e8e made getexecname no longer guarded by BOOTSTRAPPING, but it
    does not build on non-FreeBSD as it tries to use KERN_PROC_PATHNAME and
    related constants.
    
    Reviewers: mm, imp
    
    Reviewed By: imp
    
    Subscribers: imp
    
    Differential Revision: https://reviews.freebsd.org/D30763
---
 cddl/lib/libspl/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index 0aac141301e4..6a918c59e27e 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -12,10 +12,8 @@ PACKAGE=	runtime
 
 SRCS = \
         assert.c \
-        getexecname.c \
         list.c \
         mkdirp.c \
-        os/freebsd/getexecname.c \
         os/freebsd/zone.c \
         page.c \
         timestamp.c \
@@ -27,6 +25,8 @@ SRCS = \
 .if !defined(BOOTSTRAPPING)
 SRCS += \
         atomic.c \
+        getexecname.c \
+        os/freebsd/getexecname.c \
         os/freebsd/gethostid.c \
         os/freebsd/getmntany.c \
         os/freebsd/mnttab.c


More information about the dev-commits-src-all mailing list