summaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-08-23 22:24:11 +0000
committerimp <imp@FreeBSD.org>2010-08-23 22:24:11 +0000
commitc3a399c4ba4528500fec8cd412c88c10c7f637f5 (patch)
tree3fedc9e4d65d62c819fe8818c625211ebbd8ef26 /rescue
parenta1a6e5ff56d4b37557fc8a042de19bfc7560dc8e (diff)
downloadFreeBSD-src-c3a399c4ba4528500fec8cd412c88c10c7f637f5.zip
FreeBSD-src-c3a399c4ba4528500fec8cd412c88c10c7f637f5.tar.gz
MFtbemd:
Prefer MACHNE_CPUARCH to MACHINE_ARCH in most contexts where you want to test of all the CPUs of a given family conform.
Diffstat (limited to 'rescue')
-rw-r--r--rescue/rescue/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index d62b6f4..54caad6 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -145,7 +145,7 @@ CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl
.endif
CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_CPUARCH} == "i386"
CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
CRUNCH_ALIAS_bsdlabel= disklabel
#.if ${MK_NCP} != "no"
@@ -161,15 +161,15 @@ CRUNCH_PROGS_sbin+= bsdlabel
CRUNCH_SRCDIR_fdisk= $(.CURDIR)/../../sbin/fdisk_pc98
.endif
-.if ${MACHINE_ARCH} == "ia64"
+.if ${MACHINE_CPUARCH} == "ia64"
CRUNCH_PROGS_sbin+= mca
.endif
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE_CPUARCH} == "sparc64"
CRUNCH_PROGS_sbin+= bsdlabel sunlabel
.endif
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64"
CRUNCH_PROGS_sbin+= bsdlabel fdisk
CRUNCH_ALIAS_bsdlabel= disklabel
.endif
OpenPOWER on IntegriCloud