diff options
author | imp <imp@FreeBSD.org> | 2010-08-23 22:24:11 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2010-08-23 22:24:11 +0000 |
commit | c3a399c4ba4528500fec8cd412c88c10c7f637f5 (patch) | |
tree | 3fedc9e4d65d62c819fe8818c625211ebbd8ef26 /sbin | |
parent | a1a6e5ff56d4b37557fc8a042de19bfc7560dc8e (diff) | |
download | FreeBSD-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 'sbin')
-rw-r--r-- | sbin/atm/atmconfig/Makefile | 3 | ||||
-rw-r--r-- | sbin/bsdlabel/Makefile | 2 | ||||
-rw-r--r-- | sbin/camcontrol/Makefile | 3 | ||||
-rw-r--r-- | sbin/gbde/Makefile | 2 | ||||
-rw-r--r-- | sbin/newfs_msdos/Makefile | 3 | ||||
-rw-r--r-- | sbin/sunlabel/Makefile | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/sbin/atm/atmconfig/Makefile b/sbin/atm/atmconfig/Makefile index 8564d35..cbf5a9a 100644 --- a/sbin/atm/atmconfig/Makefile +++ b/sbin/atm/atmconfig/Makefile @@ -27,7 +27,8 @@ LDADD= -lbsnmp CLEANFILES+= oid.h .endif -.if ${MACHINE_ARCH} == "arm" +# XXX - this is verboten +.if ${MACHINE_CPUARCH} == "arm" WARNS?= 3 .endif diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile index b60bbd0..f91f160 100644 --- a/sbin/bsdlabel/Makefile +++ b/sbin/bsdlabel/Makefile @@ -8,7 +8,7 @@ SRCS= bsdlabel.c geom_bsd_enc.c #MAN= bsdlabel.5 MAN+= bsdlabel.8 -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel MLINKS= bsdlabel.8 disklabel.8 .endif diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile index 31bbd46..877e332 100644 --- a/sbin/camcontrol/Makefile +++ b/sbin/camcontrol/Makefile @@ -7,7 +7,8 @@ SRCS+= modeedit.c .else CFLAGS+= -DMINIMALISTIC .endif -.if ${MACHINE_ARCH} == "arm" +# This is verboten +.if ${MACHINE_CPUARCH} == "arm" WARNS?= 3 .endif DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL} diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile index 0faa6ba..2abfcb8 100644 --- a/sbin/gbde/Makefile +++ b/sbin/gbde/Makefile @@ -9,7 +9,7 @@ SRCS+= g_bde_lock.c # rijndael-fst.c does evil casting things which results in warnings on # 64 bit machines, the test-vectors check out however, so it works right. -.if ${MACHINE_ARCH} != "i386" +.if ${MACHINE_CPUARCH} != "i386" WARNS?= 3 .endif diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile index 558f673..0a9ffb4 100644 --- a/sbin/newfs_msdos/Makefile +++ b/sbin/newfs_msdos/Makefile @@ -3,7 +3,8 @@ PROG= newfs_msdos MAN= newfs_msdos.8 -.if ${MACHINE_ARCH} == "arm" +# XXX - this is verboten +.if ${MACHINE_CPUARCH} == "arm" WARNS?= 3 .endif diff --git a/sbin/sunlabel/Makefile b/sbin/sunlabel/Makefile index 9eb1a32..ed64bee 100644 --- a/sbin/sunlabel/Makefile +++ b/sbin/sunlabel/Makefile @@ -6,7 +6,7 @@ PROG= sunlabel SRCS= sunlabel.c geom_sunlabel_enc.c MAN= sunlabel.8 -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" LINKS= ${BINDIR}/sunlabel ${BINDIR}/disklabel MLINKS= sunlabel.8 disklabel.8 .endif |