summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/conf/Makefile.sparc
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-12-02 20:57:09 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-12-02 20:57:09 +0000
commitfaf62ee2ac57cbc763bff89d7dcb6315b1e32b05 (patch)
tree0c663c4baa63769ed04e5f8bae5d7abe9b98af04 /sys/arch/sparc/conf/Makefile.sparc
parentf339feb60237a89432a5f66fc164e6c6c505602c (diff)
After the most recent change, make it possible to make -j again. The
early MD and late MI files must be split up so that vers.o can sneak between. Issue spotted by bluhm, repair discussed with miod
Diffstat (limited to 'sys/arch/sparc/conf/Makefile.sparc')
-rw-r--r--sys/arch/sparc/conf/Makefile.sparc10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index 1a7ce9ceadb..b440048e17e 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sparc,v 1.67 2010/12/02 04:35:03 deraadt Exp $
+# $OpenBSD: Makefile.sparc,v 1.68 2010/12/02 20:57:08 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -70,11 +70,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
-SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
+SYSTEM_HEAD= locore.o param.o ioconf.o
+SYSTEM_DEP= Makefile ${SYSTEM_HEAD} ${OBJS}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_HEAD} vers.o $${OBJS}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_HEAD} vers.o ${OBJS}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=