From 456eeabebc464774d0c13332c1a05b6485c6e894 Mon Sep 17 00:00:00 2001 From: Matt Macy Date: Sat, 9 Jun 2018 02:25:18 +0000 Subject: [PATCH] pmc: fix logic in skipping riscv --- lib/Makefile | 2 +- usr.sbin/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index f739f5239f8f..709ce43e223f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -202,7 +202,7 @@ _libdl= libdl .endif SUBDIR.${MK_OPENSSL}+= libmp -.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100) && ${MACHINE_CPUARCH} != "riscv") +.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100 && ${MACHINE_CPUARCH} != "riscv")) SUBDIR.${MK_PMC}+= libpmc libpmcstat .endif SUBDIR.${MK_RADIUS_SUPPORT}+= libradius diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 1b19af056e90..81edff4f0757 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -179,7 +179,7 @@ SUBDIR.${MK_OPENSSL}+= keyserv SUBDIR.${MK_PC_SYSINSTALL}+= pc-sysinstall SUBDIR.${MK_PF}+= ftp-proxy SUBDIR.${MK_PKGBOOTSTRAP}+= pkg -.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100) && ${MACHINE_CPUARCH} != "riscv") +.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100 && ${MACHINE_CPUARCH} != "riscv")) SUBDIR.${MK_PMC}+= pmc SUBDIR.${MK_PMC}+= pmcannotate SUBDIR.${MK_PMC}+= pmccontrol