aboutsummaryrefslogtreecommitdiff
path: root/cddl/lib
diff options
context:
space:
mode:
Diffstat (limited to 'cddl/lib')
-rw-r--r--cddl/lib/libspl/Makefile28
-rw-r--r--cddl/lib/libuutil/Makefile2
-rw-r--r--cddl/lib/libzfs/Makefile5
3 files changed, 10 insertions, 25 deletions
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index 8088ef497d46..f565683fba4e 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/os/freebsd
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
@@ -11,11 +10,13 @@ PACKAGE= runtime
SRCS = \
assert.c \
+ getexecname.c \
list.c \
mkdirp.c \
+ os/freebsd/getexecname.c \
+ os/freebsd/zone.c \
page.c \
timestamp.c \
- zone.c \
include/sys/list.h \
include/sys/list_impl.h
@@ -23,25 +24,12 @@ SRCS = \
# will not compile when building on macOS.
.if !defined(BOOTSTRAPPING)
SRCS += \
- getexecname.c \
- gethostid.c \
- getmntany.c \
- mnttab.c
-
-
-.if ${MACHINE_ARCH} == "amd64"
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/asm-x86_64
-SRCS += atomic.S
-.elif ${MACHINE_ARCH} == "i386"
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/asm-i386
-SRCS += atomic.S
-.else
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/asm-generic
-SRCS += atomic.c
-.endif
+ atomic.c \
+ os/freebsd/gethostid.c \
+ os/freebsd/getmntany.c \
+ os/freebsd/mnttab.c
.endif
-
WARNS?= 2
CSTD= c99
CFLAGS+= -DIN_BASE
@@ -53,6 +41,6 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
-CFLAGS.atomic.S+= -DLOCORE
+CFLAGS.atomic.c+= -Wno-error-atomic-alignment
.include <bsd.lib.mk>
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 76567b50c610..169b8d8afe01 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -7,11 +7,9 @@ LIB= uutil
SRCS=\
uu_alloc.c \
uu_avl.c \
- uu_dprintf.c \
uu_ident.c \
uu_list.c \
uu_misc.c \
- uu_open.c \
uu_pname.c \
uu_string.c
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index b159955c0212..6de09d1b7333 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -5,7 +5,6 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare/os/freebsd
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
@@ -53,8 +52,8 @@ USER_C += \
USER_C += \
libshare.c \
nfs.c \
- smb.c
-
+ os/freebsd/nfs.c \
+ os/freebsd/smb.c
KERNEL_C = \
algs/sha2/sha2.c \