diff options
author | Warner Losh <imp@FreeBSD.org> | 2010-08-23 22:24:11 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2010-08-23 22:24:11 +0000 |
commit | 25faff346c8453b8248f99c7cff71708262faa37 (patch) | |
tree | 3fedc9e4d65d62c819fe8818c625211ebbd8ef26 /usr.sbin | |
parent | 222447d5e0b0966ae6350312718c2c783c3ce88b (diff) | |
download | src-test2-25faff346c8453b8248f99c7cff71708262faa37.tar.gz src-test2-25faff346c8453b8248f99c7cff71708262faa37.zip |
MFtbemd:
Prefer MACHNE_CPUARCH to MACHINE_ARCH in most contexts where you want
to test of all the CPUs of a given family conform.
Notes
Notes:
svn path=/head/; revision=211725
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/ac/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/amd/Makefile.inc | 2 | ||||
-rw-r--r-- | usr.sbin/apm/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/kldxref/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/sade/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/tcpdump/tcpdump/Makefile | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile index 46064fcf300b..576dbb3323ce 100644 --- a/usr.sbin/ac/Makefile +++ b/usr.sbin/ac/Makefile @@ -4,7 +4,7 @@ PROG= ac MAN= ac.8 # Temporary, while tracking down problem wrt 64-bit time_t's on sparc64 -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" CFLAGS+=-DDEBUG .endif diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc index 673edc1b9152..1965ff933e4c 100644 --- a/usr.sbin/amd/Makefile.inc +++ b/usr.sbin/amd/Makefile.inc @@ -27,7 +27,7 @@ CFLAGS+= -DHAVE_LOCALCONFIG_H CFLAGS+= -DYES_HESIOD .endif -CFLAGS+= -DHOST_CPU=\"${MACHINE_ARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\" +CFLAGS+= -DHOST_CPU=\"${MACHINE_CPUARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\" .if exists(${.OBJDIR}/../libamu) LIBAMUDIR= ${.OBJDIR}/../libamu diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile index 08ed25fce66a..3cc6f5042ea9 100644 --- a/usr.sbin/apm/Makefile +++ b/usr.sbin/apm/Makefile @@ -3,6 +3,6 @@ PROG= apm MAN= apm.8 MLINKS= apm.8 apmconf.8 -MANSUBDIR= /${MACHINE_ARCH} +MANSUBDIR= /${MACHINE_CPUARCH} .include <bsd.prog.mk> diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile index 2f1550583cf7..c877a8a57ffe 100644 --- a/usr.sbin/kldxref/Makefile +++ b/usr.sbin/kldxref/Makefile @@ -7,8 +7,8 @@ SRCS= kldxref.c ef.c ef_obj.c WARNS?= 2 CFLAGS+=-fno-strict-aliasing -.if exists(ef_${MACHINE_ARCH}.c) -SRCS+= ef_${MACHINE_ARCH}.c +.if exists(ef_${MACHINE_CPUARCH}.c) +SRCS+= ef_${MACHINE_CPUARCH}.c .else SRCS+= ef_nop.c .endif diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index bd94155595a3..ad284894df0d 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.if ${MACHINE_ARCH} != "ia64" +.if ${MACHINE_CPUARCH} != "ia64" _wizard= wizard.c .endif diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index c9a7c8980ecf..d18033aacacb 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.if ${MACHINE_ARCH} != "ia64" +.if ${MACHINE_CPUARCH} != "ia64" _wizard= wizard.c .endif diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index 6f072b72effa..c29694388c4c 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -46,7 +46,7 @@ SRCS+= print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c \ print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c CFLAGS+= -DINET6 .endif -.if ${MACHINE_ARCH} != "i386" +.if ${MACHINE_CPUARCH} != "i386" CFLAGS+= -DLBL_ALIGN .endif |