diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-27 16:43:43 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-27 16:43:43 +0000 |
| commit | 084eadb7ab47f77e4f6dea94d3626b2b339f62de (patch) | |
| tree | a43b70c6df4bf61898f423d58ca8db983fe4c8b6 /sys/arch/armish | |
| parent | dd42f700d9130d625243b36801652927d3e783ec (diff) | |
Use the form ${_archdir}/${_arch} to reach a few more places, unifying the
arm Makefiles a substantial step forward
Diffstat (limited to 'sys/arch/armish')
| -rw-r--r-- | sys/arch/armish/conf/Makefile.armish | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish index abc061c44f6..795f65d304b 100644 --- a/sys/arch/armish/conf/Makefile.armish +++ b/sys/arch/armish/conf/Makefile.armish @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armish,v 1.22 2010/04/27 15:33:08 deraadt Exp $ +# $OpenBSD: Makefile.armish,v 1.23 2010/04/27 16:43:42 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -94,10 +94,11 @@ SYSTEM_LD_HEAD+=; \ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o -SYSTEM_LD_TAIL= @dd if=/dev/zero of=bsd bs=1 count=1 seek=95 conv=notrunc 2>/dev/null; \ +SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@ +SYSTEM_LD_TAIL+=; \ + dd if=/dev/zero of=bsd bs=1 count=1 seek=95 conv=notrunc 2>/dev/null; \ dd if=/dev/zero of=bsd bs=1 count=1 seek=127 conv=notrunc 2>/dev/null; \ - dd if=/dev/zero of=bsd bs=1 count=1 seek=159 conv=notrunc 2>/dev/null; \ - ${SIZE} $@; chmod 755 $@ + dd if=/dev/zero of=bsd bs=1 count=1 seek=159 conv=notrunc 2>/dev/null DEBUG?= .if ${DEBUG} == "-g" @@ -156,11 +157,11 @@ links: sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink makelinks -SRCS= ${_archdir}/arm/locore.S \ +SRCS= ${_archdir}/${_arch}/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -179,7 +180,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk ${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h ${NORMAL_S} -locore.o: ${_archdir}/arm/locore.S assym.h +locore.o: ${_archdir}/${_arch}/locore.S assym.h ${NORMAL_S} # The install target can be redefined by putting a |