Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Aug 2015 23:12:30 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r287085 - in head: . cddl/lib
Message-ID:  <201508232312.t7NNCUP1073772@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Sun Aug 23 23:12:30 2015
New Revision: 287085
URL: https://svnweb.freebsd.org/changeset/base/287085

Log:
  Sparc64 is the odd-man out, so form the if that way rather than
  listing everybody else.

Modified:
  head/Makefile.inc1
  head/cddl/lib/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sun Aug 23 21:42:27 2015	(r287084)
+++ head/Makefile.inc1	Sun Aug 23 23:12:30 2015	(r287085)
@@ -1778,9 +1778,7 @@ cddl/lib/libctf__L: lib/libz__L
 .endif
 # cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built
 # on select architectures though (see cddl/lib/Makefile)
-.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
-	${MACHINE_CPUARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \
-	${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} != "sparc64"
 _prebuild_libs+=	lib/libproc lib/librtld_db
 .endif
 

Modified: head/cddl/lib/Makefile
==============================================================================
--- head/cddl/lib/Makefile	Sun Aug 23 21:42:27 2015	(r287084)
+++ head/cddl/lib/Makefile	Sun Aug 23 23:12:30 2015	(r287085)
@@ -26,9 +26,7 @@ _libzpool=	libzpool
 .endif
 .endif
 
-.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
-	${MACHINE_CPUARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \
-	${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} != "sparc64"
 _drti=		drti
 _libdtrace=	libdtrace
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508232312.t7NNCUP1073772>