From c404eb64d65a7b87c87ec735fc3afb6b58effa24 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 23 Aug 2015 23:12:30 +0000 Subject: [PATCH] Sparc64 is the odd-man out, so form the if that way rather than listing everybody else. --- Makefile.inc1 | 4 +--- cddl/lib/Makefile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 617366c0964a..74b83c356ca3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index f418993200ed..9371865ca428 100644 --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -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