opts: Minor cleanup of ZFS options
Remove redundant CPUARCH test: we really just want a plain MACHINE_ARCH here. Second, always turn off LOADER_ZFS when we turn off ZFS. Not 100% required, but we did it some places and not others. There's no current mechanism to say that if X is disabled then X_Y must be too. Sponsored by: Netflix
This commit is contained in:
parent
1955ad42b3
commit
9503d2704c
@ -355,9 +355,9 @@ __DEFAULT_NO_OPTIONS+=OPENMP
|
|||||||
BROKEN_OPTIONS+= OFED
|
BROKEN_OPTIONS+= OFED
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
# ZFS is broken on 32-bit powerpc, but works on 64-bit
|
||||||
.if ${__T} == "powerpc"
|
.if ${__T} == "powerpc"
|
||||||
BROKEN_OPTIONS+= ZFS
|
BROKEN_OPTIONS+= ZFS LOADER_ZFS
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.include <bsd.mkopt.mk>
|
.include <bsd.mkopt.mk>
|
||||||
@ -419,6 +419,7 @@ MK_KERBEROS:= no
|
|||||||
MK_KERBEROS_SUPPORT:= no
|
MK_KERBEROS_SUPPORT:= no
|
||||||
MK_LDNS:= no
|
MK_LDNS:= no
|
||||||
MK_PKGBOOTSTRAP:= no
|
MK_PKGBOOTSTRAP:= no
|
||||||
|
MK_LOADER_ZFS:= no
|
||||||
MK_ZFS:= no
|
MK_ZFS:= no
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
@ -78,7 +78,8 @@ __DEFAULT_NO_OPTIONS = \
|
|||||||
BROKEN_OPTIONS+= INIT_ALL_ZERO
|
BROKEN_OPTIONS+= INIT_ALL_ZERO
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} == "powerpc"
|
# ZFS is broken on 32-bit powerpc
|
||||||
|
.if ${MACHINE_ARCH} == "powerpc"
|
||||||
BROKEN_OPTIONS+= ZFS
|
BROKEN_OPTIONS+= ZFS
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user