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.
This commit is contained in:
Bruce Evans 1998-12-20 16:25:21 +00:00
parent 16cb3b5e57
commit 3d2ffe2196
3 changed files with 9 additions and 9 deletions

View file

@ -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

View file

@ -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

View file

@ -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