aboutsummaryrefslogtreecommitdiff
path: root/cddl/lib
diff options
context:
space:
mode:
authorAlex Richardson <arichardson@FreeBSD.org>2020-09-19 12:08:16 +0000
committerAlex Richardson <arichardson@FreeBSD.org>2020-09-19 12:08:16 +0000
commit79e02149fcb480c95cfda65e2145ed021dfde5a6 (patch)
tree3defde47c9eb9618bfd33119380455622861342a /cddl/lib
parentb8bfffc1b619cca5262f848b665bd56c4de0052b (diff)
downloadsrc-79e02149fcb480c95cfda65e2145ed021dfde5a6.tar.gz
src-79e02149fcb480c95cfda65e2145ed021dfde5a6.zip
Fix dtrace tools bootstrap on non-FreeBSD after OpenZFS import
This required surprisingly few build system changes and only two changes to the openZFS compat headers which have been upstreamed as https://github.com/openzfs/zfs/pull/10863 Reviewed By: #zfs, freqlabs Differential Revision: https://reviews.freebsd.org/D26193
Notes
Notes: svn path=/head/; revision=365901
Diffstat (limited to 'cddl/lib')
-rw-r--r--cddl/lib/libspl/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index 64317c41b730..8088ef497d46 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -14,13 +14,14 @@ SRCS = \
list.c \
mkdirp.c \
page.c \
- strlcat.c \
- strlcpy.c \
timestamp.c \
zone.c \
include/sys/list.h \
include/sys/list_impl.h
+# These functions are not required when bootstrapping and the atomic code
+# will not compile when building on macOS.
+.if !defined(BOOTSTRAPPING)
SRCS += \
getexecname.c \
gethostid.c \
@@ -38,6 +39,7 @@ SRCS += atomic.S
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/asm-generic
SRCS += atomic.c
.endif
+.endif
WARNS?= 2