diff options
| author | imp <imp@FreeBSD.org> | 2010-09-13 07:15:01 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-09-13 07:15:01 +0000 |
| commit | a05e8d3ea87a132fa8c80e21a3f74223ee2100b9 (patch) | |
| tree | af2b2cb805a68fa5cb1a5ed0b8d1ccb7fe3a6b44 | |
| parent | e87e922f3125332f002638f5f231acc7544b7ebf (diff) | |
| download | FreeBSD-src-a05e8d3ea87a132fa8c80e21a3f74223ee2100b9.zip FreeBSD-src-a05e8d3ea87a132fa8c80e21a3f74223ee2100b9.tar.gz | |
It turns out that TARGET_CPUARCH doesn't buy us much here, if anything, but
costs us another copy of the transform. Revert it.
# Maybe makefile.inc1 should set TARGET_CPUARCH for the cross-tools, but
# it doesn't now. That would solve problems in other places too.
Submitted by: jmallet@
| -rw-r--r-- | usr.sbin/crunch/crunchide/Makefile | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile index 34e5674..3e173e4 100644 --- a/usr.sbin/crunch/crunchide/Makefile +++ b/usr.sbin/crunch/crunchide/Makefile @@ -3,14 +3,6 @@ PROG= crunchide SRCS= crunchide.c -# These assignments duplicate much of the functionality of -# MACHINE_CPUARCH, but there's no easy way to export make functions... - -.if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} -.else -TARGET_CPUARCH=${MACHINE_CPUARCH} -.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == i386 && ${MACHINE_ARCH} == i386 @@ -18,9 +10,8 @@ CFLAGS+=-DNLIST_AOUT SRCS+= exec_aout.c .endif -# nb: TARGET_ARCH for powerpc64 is correct here -.if ${TARGET_CPUARCH} == ia64 || ${TARGET_ARCH} == powerpc64 || \ - ${TARGET_CPUARCH} == sparc64 || ${TARGET_CPUARCH} == amd64 +.if ${TARGET_ARCH} == ia64 || ${TARGET_ARCH} == powerpc64 || \ + ${TARGET_ARCH} == sparc64 || ${TARGET_ARCH} == amd64 CFLAGS+=-DNLIST_ELF64 SRCS+= exec_elf64.c exec_elf64.o: exec_elf32.c |
