diff options
Diffstat (limited to 'sys/arch/i386/conf/Makefile.i386')
| -rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 83cacdc8924..aa900775a4d 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.56 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.i386,v 1.57 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -116,9 +116,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/i386/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${_machdir}/i386/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -166,8 +168,9 @@ depend:: .depend ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/i386/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/i386/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep |