diff options
| author | Kip Macy <kmacy@FreeBSD.org> | 2009-05-09 05:39:35 +0000 |
|---|---|---|
| committer | Kip Macy <kmacy@FreeBSD.org> | 2009-05-09 05:39:35 +0000 |
| commit | 3f9fc7fea003e4538c3e356406f5a5d7b7d54c89 (patch) | |
| tree | 9c096f3731044d84c7d412787012592533c2be0d /cddl/lib | |
| parent | 5f17ebf94db5ebbc7fdcff60e598498df6f9e2bd (diff) | |
| download | src-3f9fc7fea003e4538c3e356406f5a5d7b7d54c89.tar.gz src-3f9fc7fea003e4538c3e356406f5a5d7b7d54c89.zip | |
atomic.S has been renamed opensolaris_atomic.S to avoid collisions
Notes
Notes:
svn path=/head/; revision=191933
Diffstat (limited to 'cddl/lib')
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 54ab6c01b2ae..fec99d92f1d8 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -13,7 +13,7 @@ # ATOMIC_SRCS .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} -ATOMIC_SRCS= atomic.S +ATOMIC_SRCS= opensolaris_atomic.S .else .PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern ATOMIC_SRCS= opensolaris_atomic.c |