From owner-dev-commits-src-main@freebsd.org Tue Jun 15 00:23:38 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9C3EE65A910; Tue, 15 Jun 2021 00:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G3pvZ2Lhtz3lBS; Tue, 15 Jun 2021 00:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 299EB1E812; Tue, 15 Jun 2021 00:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15F0NcYS095296; Tue, 15 Jun 2021 00:23:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15F0NcXA095295; Tue, 15 Jun 2021 00:23:38 GMT (envelope-from git) Date: Tue, 15 Jun 2021 00:23:38 GMT Message-Id: <202106150023.15F0NcXA095295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: d5c1296234cb - main - spl: Unbreak crossbuild after f20893853e8e MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5c1296234cb8f2077adf61fc43639ecf2e1569b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2021 00:23:38 -0000 The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d5c1296234cb8f2077adf61fc43639ecf2e1569b commit d5c1296234cb8f2077adf61fc43639ecf2e1569b Author: Jessica Clarke AuthorDate: 2021-06-15 00:23:04 +0000 Commit: Jessica Clarke 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