Module Name:    src
Committed By:   christos
Date:           Wed Jan 22 15:19:05 UTC 2014

Modified Files:
        src/share/mk: bsd.klinks.mk

Log Message:
For now, ignore errors from creating klinks. This is racy and you can get
it to trigger in 1/4 of the builds with -j 40 on a 24 processor box. Typical
error is:

    ln: machine/include: File exists
    *** Failed target:  .BEGIN
    *** Failed command: rm -f machine && ln -s 
/p/netbsd/cvsroot/src/sys/arch/vax/include machine
    *** Error code 1
    Stop.

Another approach to fixing this is to create a lockfile or adding other flags
to ln to change its behavior.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/share/mk/bsd.klinks.mk

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

Modified files:

Index: src/share/mk/bsd.klinks.mk
diff -u src/share/mk/bsd.klinks.mk:1.11 src/share/mk/bsd.klinks.mk:1.12
--- src/share/mk/bsd.klinks.mk:1.11	Wed Aug 21 11:26:44 2013
+++ src/share/mk/bsd.klinks.mk	Wed Jan 22 10:19:05 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.klinks.mk,v 1.11 2013/08/21 15:26:44 matt Exp $
+#	$NetBSD: bsd.klinks.mk,v 1.12 2014/01/22 15:19:05 christos Exp $
 #
 
 .include <bsd.own.mk>
@@ -41,41 +41,41 @@ CLEANFILES+=	x86
 # XXX   .BEGIN is used to make sure the links are done before anything else.
 .if !make(obj) && !make(clean) && !make(cleandir)
 .BEGIN:
-	@rm -f machine && \
+	-@rm -f machine && \
 	    ln -s $S/arch/${KLINK_MACHINE}/include machine
-	@rm -f ${KLINK_MACHINE} && \
+	-@rm -f ${KLINK_MACHINE} && \
 	    ln -s $S/arch/${KLINK_MACHINE}/include ${KLINK_MACHINE}
-	@if [ -d $S/arch/${MACHINE_CPU} ]; then \
+	-@if [ -d $S/arch/${MACHINE_CPU} ]; then \
 	    rm -f ${MACHINE_CPU} && \
 	    ln -s $S/arch/${MACHINE_CPU}/include ${MACHINE_CPU}; \
 	 fi
 # XXX. it gets worse..
 .if ${KLINK_MACHINE} == "sun2" || ${KLINK_MACHINE} == "sun3"
-	@rm -f sun68k && \
+	-@rm -f sun68k && \
 	    ln -s $S/arch/sun68k/include sun68k
 .endif
 .if ${KLINK_MACHINE} == "sparc64"
-	@rm -f sparc && \
+	-@rm -f sparc && \
 	    ln -s $S/arch/sparc/include sparc
 .endif
 .if ${KLINK_MACHINE} == "amd64"
-	@rm -f i386 && \
+	-@rm -f i386 && \
 	    ln -s $S/arch/i386/include i386
 .endif
 .if ${MACHINE_CPU} == "i386" || ${MACHINE_CPU} == "x86_64"
-	@rm -f x86 && \
+	-@rm -f x86 && \
 	    ln -s $S/arch/x86/include x86
 .endif
 .if defined(XEN_BUILD) || ${KLINK_MACHINE} == "xen"
-	@rm -f xen && \
+	-@rm -f xen && \
 	    ln -s $S/arch/xen/include xen
-	@rm -rf xen-ma && mkdir xen-ma && \
+	-@rm -rf xen-ma && mkdir xen-ma && \
 	    ln -s ../${XEN_BUILD:U${MACHINE_ARCH}} xen-ma/machine
 .endif
 .if ${KLINK_MACHINE} == "evbmips"
-	@rm -f algor && \
+	-@rm -f algor && \
 	    ln -s $S/arch/algor/include algor
-	@rm -f sbmips && \
+	-@rm -f sbmips && \
 	    ln -s $S/arch/sbmips/include sbmips
 .endif
 .endif

Reply via email to