Module Name:    src
Committed By:   tsutsui
Date:           Sun May  3 15:12:12 UTC 2009

Modified Files:
        src/sys/arch/landisk/stand: Makefile.bootprogs

Log Message:
Fix race on parallel build by using the same way with i386.

XXX: we can't use <bsd.klinks.mk> if Makefile needs own .BEGIN: target.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/landisk/stand/Makefile.bootprogs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/landisk/stand/Makefile.bootprogs
diff -u src/sys/arch/landisk/stand/Makefile.bootprogs:1.2 src/sys/arch/landisk/stand/Makefile.bootprogs:1.3
--- src/sys/arch/landisk/stand/Makefile.bootprogs:1.2	Mon Apr 13 12:54:45 2009
+++ src/sys/arch/landisk/stand/Makefile.bootprogs	Sun May  3 15:12:12 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.2 2009/04/13 12:54:45 nonaka Exp $
+# $NetBSD: Makefile.bootprogs,v 1.3 2009/05/03 15:12:12 tsutsui Exp $
 
 S=		${.CURDIR}/../../../../..
 
@@ -29,15 +29,16 @@
 CPPFLAGS+=	-DSH4
 CPPFLAGS+=	-I${.OBJDIR} -I${.CURDIR}/.. -I${.CURDIR}/../../boot -I${S}
 
-.include <bsd.klinks.mk>
-
-lib:
+.if !make(obj) && !make(clean) && !make(cleandir)
+.BEGIN:
+	-rm -f machine && \
+	    ln -s ${S}/arch/${MACHINE}/include machine
+	-rm -f ${MACHINE_CPU} && \
+	    ln -s ${S}/arch/${MACHINE_CPU}/include ${MACHINE_CPU}
 .ifdef LIBOBJ
-	-rm -f $@
-	ln -s ${LIBOBJ}/lib .
-	[ -d ${LIBOBJ}/lib ] || mkdir ${LIBOBJ}/lib
-.else
-	mkdir lib
+	-rm -f lib && ln -s ${LIBOBJ}/lib lib
+	mkdir -p ${LIBOBJ}/lib
+.endif
 .endif
 
 ### find out what to use for libsa
@@ -56,8 +57,6 @@
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ= ${ZLIB}
 
-realdepend realall: lib
-
 cleandir distclean: cleanlibdir
 
 cleanlibdir:

Reply via email to