diff options
| author | marcel <marcel@FreeBSD.org> | 1999-11-14 13:54:44 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 1999-11-14 13:54:44 +0000 |
| commit | 17ed6e05da9e78604972eb2120615a505953fd25 (patch) | |
| tree | 571f4f72304b0d631bd6808faace186b95d27a21 /sys/boot | |
| parent | 281ba43ee5ba4c4ff8ac1085144a3d1d7c550386 (diff) | |
| download | FreeBSD-src-17ed6e05da9e78604972eb2120615a505953fd25.zip FreeBSD-src-17ed6e05da9e78604972eb2120615a505953fd25.tar.gz | |
${MACHINE} -> ${MACHINE_ARCH}
All Makefiles now use MACHINE_ARCH for the target architecture.
Unification is required for cross-building.
Tags added to:
sys/boot/Makefile
sys/boot/arc/loader/Makefile
sys/kern/Makefile
usr.bin/cpp/Makefile
usr.bin/gcore/Makefile
usr.bin/truss/Makefile
usr.bin/gcore/Makefile:
fixed typo: MACHINDE -> MACHINE_ARCH
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/Makefile | 6 | ||||
| -rw-r--r-- | sys/boot/arc/lib/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/arc/loader/Makefile | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/sys/boot/Makefile b/sys/boot/Makefile index 8d7e2ad..0cdaeb2 100644 --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -1,11 +1,13 @@ +# $FreeBSD$ + # Build the add-in FORTH interpreter SUBDIR+= ficl # Pick the machine-dependant subdir based on the target architecture. -SUBDIR+= ${MACHINE} +SUBDIR+= ${MACHINE_ARCH} # Build ARC / AlphaBIOS executable on the Alpha -.if ${MACHINE} == "alpha" +.if ${MACHINE_ARCH} == "alpha" SUBDIR+= arc .endif diff --git a/sys/boot/arc/lib/Makefile b/sys/boot/arc/lib/Makefile index 023821c..a9c0e2d 100644 --- a/sys/boot/arc/lib/Makefile +++ b/sys/boot/arc/lib/Makefile @@ -5,7 +5,7 @@ NOPIC= true NOPROFILE= true INTERNALLIB= true -.PATH: ${.CURDIR}/arch/${MACHINE} +.PATH: ${.CURDIR}/arch/${MACHINE_ARCH} # XXX hack to pick up stand.h LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand CFLAGS= -I${LIBSTANDDIR} @@ -22,7 +22,7 @@ CFLAGS+= -I${.CURDIR}/../../common -mno-fp-regs \ SRCS= delay.c time.c abort.c setjmperr.c copy.c devicename.c module.c \ arcconsole.c arcdisk.c elf_freebsd.c bootinfo.c -.if ${MACHINE} == "alpha" +.if ${MACHINE_ARCH} == "alpha" SRCS+= rpb.c .endif diff --git a/sys/boot/arc/loader/Makefile b/sys/boot/arc/loader/Makefile index 1fdb2c3..acbb066 100644 --- a/sys/boot/arc/loader/Makefile +++ b/sys/boot/arc/loader/Makefile @@ -1,4 +1,5 @@ # $NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $ +# $FreeBSD$ BASE= loader PROG= ${BASE}.exe @@ -63,7 +64,7 @@ beforeinstall: .endif # Other fragments still to be brought in from ../Makfile.booters? -start.o: ${.CURDIR}/../lib/arch/${MACHINE}/start.S +start.o: ${.CURDIR}/../lib/arch/${MACHINE_ARCH}/start.S ${CC} -c ${CFLAGS} $< setdef0.o: setdefs.h |
