Date: Thu, 29 Dec 2011 13:31:34 -0500 From: John Baldwin <jhb@freebsd.org> To: arch@freebsd.org Subject: Update 'make cscope' to handle MACHINE_CPUARCH and 'x86' Message-ID: <201112291331.34671.jhb@freebsd.org>
next in thread | raw e-mail | index | archive | help
This patch updates 'make cscope' to automatically add MACHINE_CPUARCH to
CSCOPE_ARCHDIR if it differs from MACHINE. It also adds a special case to
include the 'x86' directory for targets that use sys/x86.
Index: Makefile
===================================================================
--- Makefile (revision 228954)
+++ Makefile (working copy)
@@ -13,11 +13,19 @@ CSCOPEDIRS= boot bsm cam cddl compat conf contrib
netgraph netinet netinet6 netipsec netipx netnatm netncp \
netsmb nfs nfsclient nfsserver nlm opencrypto \
pci rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
+.if !defined(CSCOPE_ARCHDIR)
.if defined(ALL_ARCH)
-CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 x86
+CSCOPE_ARCHDIR = amd64 arm i386 ia64 mips pc98 powerpc sparc64 x86
.else
-CSCOPE_ARCHDIR ?= ${MACHINE}
+CSCOPE_ARCHDIR = ${MACHINE}
+.if ${MACHINE} != ${MACHINE_CPUARCH}
+CSCOPE_ARCHDIR += ${MACHINE_CPUARCH}
.endif
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+CSCOPE_ARCHDIR += x86
+.endif
+.endif
+.endif
# Loadable kernel modules
--
John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112291331.34671.jhb>