diff options
| author | bde <bde@FreeBSD.org> | 1998-12-20 16:25:21 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-12-20 16:25:21 +0000 |
| commit | ff048604b9e27bc7eaeb68743a093b8efb7aa6d7 (patch) | |
| tree | 1f72cfb630029b4be97d80e420596a820d671e0b /sys/conf | |
| parent | 7674c039cb44788866d1cae5514947f4ed4ce6a1 (diff) | |
| download | FreeBSD-src-ff048604b9e27bc7eaeb68743a093b8efb7aa6d7.zip FreeBSD-src-ff048604b9e27bc7eaeb68743a093b8efb7aa6d7.tar.gz | |
Fixed building elf kernels without a `make depend' step. The magic
ordering in rev.1.38 was broken by putting setdef0.o before vnode_if.o
in SYSTEM_OBJS.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/Makefile.i386 | 6 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index ddf2f9b..2da7db8 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.129 1998/11/15 18:07:35 dfr Exp $ +# $Id: Makefile.i386,v 1.130 1998/12/07 22:36:53 imp Exp $ # # Makefile for FreeBSD # @@ -94,8 +94,8 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \ size -aout ${.TARGET} ; chmod 755 ${.TARGET} .endif .if ${KERNFORMAT} == elf -SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so +SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ + setdef0.o setdef1.o hack.so SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \ -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index ddf2f9b..2da7db8 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.129 1998/11/15 18:07:35 dfr Exp $ +# $Id: Makefile.i386,v 1.130 1998/12/07 22:36:53 imp Exp $ # # Makefile for FreeBSD # @@ -94,8 +94,8 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \ size -aout ${.TARGET} ; chmod 755 ${.TARGET} .endif .if ${KERNFORMAT} == elf -SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so +SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ + setdef0.o setdef1.o hack.so SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \ -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o |
