Module Name: src
Committed By: christos
Date: Wed Dec 6 02:06:45 UTC 2017
Modified Files:
src/share/mk: bsd.klinks.mk
Log Message:
remove multiple copies of the same logic.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/share/mk/bsd.klinks.mk:1.14
--- src/share/mk/bsd.klinks.mk:1.13 Sun Aug 10 01:57:31 2014
+++ src/share/mk/bsd.klinks.mk Tue Dec 5 21:06:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.klinks.mk,v 1.13 2014/08/10 05:57:31 matt Exp $
+# $NetBSD: bsd.klinks.mk,v 1.14 2017/12/06 02:06:45 christos Exp $
#
.include <bsd.own.mk>
@@ -7,81 +7,50 @@ KLINK_MACHINE?= ${MACHINE}
##### Default values
.if !defined(S)
-.if defined(NETBSDSRCDIR)
+. if defined(NETBSDSRCDIR)
S= ${NETBSDSRCDIR}/sys
-.elif defined(BSDSRCDIR)
+. elif defined(BSDSRCDIR)
S= ${BSDSRCDIR}/sys
-.else
+. else
S= /sys
+. endif
.endif
-.endif
-CLEANFILES+= machine ${MACHINE_CPU} ${KLINK_MACHINE}
+KLINKFILES+= ${MACHINE_CPU} ${KLINK_MACHINE}
+
.if ${KLINK_MACHINE} == "sun2" || ${KLINK_MACHINE} == "sun3"
-CLEANFILES+= sun68k
+KLINKFILES+= sun68k
.elif ${KLINK_MACHINE} == "sparc64"
-CLEANFILES+= sparc
+KLINKFILES+= sparc
.elif ${KLINK_MACHINE} == "i386"
-CLEANFILES+= x86
+KLINKFILES+= x86
.elif ${KLINK_MACHINE} == "amd64"
-CLEANFILES+= x86 i386
+KLINKFILES+= x86 i386
.elif ${KLINK_MACHINE} == "evbmips"
-CLEANFILES+= algor sbmips
+KLINKFILES+= algor sbmips
.elif ${MACHINE_CPU} == "aarch64"
-CLEANFILES+= arm
-.endif
-
-.if defined(XEN_BUILD) || ${KLINK_MACHINE} == "xen"
-CLEANFILES+= xen xen-ma/machine # xen-ma
+KLINKFILES+= arm
+.elif defined(XEN_BUILD) || ${KLINK_MACHINE} == "xen"
+KLINKFILES+= xen
+CLEANFILES+= xen-ma/machine # xen-ma
CPPFLAGS+= -I${.OBJDIR}/xen-ma
-.if ${MACHINE_CPU} == "i386"
-CLEANFILES+= x86
-.endif
.endif
+CLEANFILES+= machine ${KLINKFILES}
+
# XXX. This should be done a better way. It's @'d to reduce visual spew.
# 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 && \
ln -s $S/arch/${KLINK_MACHINE}/include machine
- -@rm -f ${KLINK_MACHINE} && \
- ln -s $S/arch/${KLINK_MACHINE}/include ${KLINK_MACHINE}
- -@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 && \
- ln -s $S/arch/sun68k/include sun68k
-.endif
-.if ${KLINK_MACHINE} == "sparc64"
- -@rm -f sparc && \
- ln -s $S/arch/sparc/include sparc
-.endif
-.if ${KLINK_MACHINE} == "amd64"
- -@rm -f i386 && \
- ln -s $S/arch/i386/include i386
-.endif
-.if ${MACHINE_CPU} == "i386" || ${MACHINE_CPU} == "x86_64"
- -@rm -f x86 && \
- ln -s $S/arch/x86/include x86
-.endif
-.if ${MACHINE_CPU} == "aarch64"
- -@rm -f arm && \
- ln -s $S/arch/arm/include arm
-.endif
-.if defined(XEN_BUILD) || ${KLINK_MACHINE} == "xen"
- -@rm -f xen && \
- ln -s $S/arch/xen/include xen
+. for kl in ${KLINKFILES}
+ -@if [ -d $S/arch/${kl}/include ]; then \
+ rm -f ${kl} && ln -s $S/arch/${kl}/include ${kl}; \
+ fi
+. endfor
+. if defined(XEN_BUILD) || ${KLINK_MACHINE} == "xen"
-@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 && \
- ln -s $S/arch/algor/include algor
- -@rm -f sbmips && \
- ln -s $S/arch/sbmips/include sbmips
-.endif
+. endif
.endif
