diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-08-14 13:47:53 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-08-14 13:47:53 +0000 |
| commit | bc5f0f98bf6e876b9640b4e0d9bca8820b57768e (patch) | |
| tree | 86ed3d8328b90a91bc321dc043374f5a0224621a | |
| parent | 8e540882a67620b51edc030bdd66c5704c841dc3 (diff) | |
Merge identical amd64 and i386 stanzas.
Requested & ok jsing@
| -rw-r--r-- | usr.sbin/installboot/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.sbin/installboot/Makefile b/usr.sbin/installboot/Makefile index f699cc5133a..1362c36c36f 100644 --- a/usr.sbin/installboot/Makefile +++ b/usr.sbin/installboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2016/07/20 19:56:24 krw Exp $ +# $OpenBSD: Makefile,v 1.19 2016/08/14 13:47:52 krw Exp $ PROG= installboot SRCS= installboot.c util.c @@ -10,7 +10,7 @@ DPADD= ${LIBUTIL} LDSTATIC= ${STATIC} -.if ${MACHINE} == "amd64" +.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" CFLAGS += -DSOFTRAID SRCS += i386_installboot.c SRCS += i386_nlist.c @@ -20,11 +20,6 @@ SRCS += armv7_installboot.c .elif ${MACHINE} == "hppa" CFLAGS += -DBOOTSTRAP SRCS += hppa_installboot.c -.elif ${MACHINE} == "i386" -CFLAGS += -DSOFTRAID -SRCS += i386_installboot.c -SRCS += i386_nlist.c -SRCS += i386_softraid.c .elif ${MACHINE} == "landisk" CFLAGS += -DBOOTSTRAP SRCS += landisk_installboot.c |