diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2002-10-05 21:48:44 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2002-10-05 21:48:44 +0000 |
commit | ba0c4e667cc067f33c9f08fbdcf1ea1827b4b26b (patch) | |
tree | 37a1c1ed270a838a7a31f0bb7bf936bffa321440 | |
parent | BROKEN: Does not compile (diff) |
Switch over to using <bsd.cpu.mk> feature tests to enable asm
optimization.
Approved by: maintainer timeout
-rw-r--r-- | security/john/Makefile | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/security/john/Makefile b/security/john/Makefile index ccf8a6ed350d..8a98570960f7 100644 --- a/security/john/Makefile +++ b/security/john/Makefile @@ -21,26 +21,17 @@ MAINTAINER= dominic_marks@btinternet.com OSNAME= ${OPSYS:S/F/f/:S/N/n/:S/O/o/:S/B/b/:S/S/s/:S/D/d/} -.if (${ARCH} == "i386") +.if ${MACHINE_ARCH} == "i386" ARCHNAME= x86 +. if ${MACHINE_CPU:Mk6} +ALL_TARGET= ${OSNAME}-${ARCHNAME}-k6-elf +. elif ${MACHINE_CPU:Mmmx} +ALL_TARGET= ${OSNAME}-${ARCHNAME}-mmx-elf +. else +ALL_TARGET= ${OSNAME}-${ARCHNAME}-any-elf +. endif .else -ARCHNAME= ${ARCH} -.endif - -# could do something w/ -# if sysctl -n hw.model | grep AMD >/dev/null ; then echo AMD ; fi -.if defined(HAVE_K6) -ALL_TARGET= ${OSNAME}-${ARCHNAME}-k6-BINFMT -.elif defined(HAVE_MMX) -ALL_TARGET= ${OSNAME}-${ARCHNAME}-mmx-BINFMT -.else -ALL_TARGET= ${OSNAME}-${ARCHNAME}-any-BINFMT -.endif - -.if ${PORTOBJFORMAT} == "elf" -ALL_TARGET:= ${ALL_TARGET:S/BINFMT$/${PORTOBJFORMAT}/} -.else -ALL_TARGET:= ${ALL_TARGET:S/BINFMT$/a.out/} +ARCHNAME= ${MACHINE_ARCH} .endif WRKSRC= ${WRKDIR}/${DISTNAME}/src |