diff options
Diffstat (limited to 'cddl/lib')
-rw-r--r-- | cddl/lib/Makefile | 2 | ||||
-rw-r--r-- | cddl/lib/libzpool/Makefile | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index 4ee4780..94a93a1 100644 --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -11,9 +11,7 @@ SUBDIR= libavl \ .if ${MK_ZFS} != "no" _libzfs= libzfs -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _libzpool= libzpool .endif -.endif .include <bsd.subdir.mk> diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 28e09b9..f086b6d 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -11,7 +11,13 @@ # LIST_SRCS .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os # ATOMIC_SRCS +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +ATOMIC_SRCS= atomic.S +.else +.PATH: ${.CURDIR}/../../../sys/compat/opensolaris/kern +ATOMIC_SRCS= opensolaris_atomic.c +.endif LIB= zpool @@ -19,7 +25,6 @@ ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} KERNEL_SRCS= kernel.c taskq.c util.c LIST_SRCS= list.c -ATOMIC_SRCS= atomic.S SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \ ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} |