svn commit: r334867 - in head: lib usr.sbin

[Matt Macy]

Author: mmacy
Date: Sat Jun  9 02:25:18 2018
New Revision: 334867
URL: https://svnweb.freebsd.org/changeset/base/334867

Log:
  pmc: fix logic in skipping riscv

Modified:
  head/lib/Makefile
  head/usr.sbin/Makefile

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Sat Jun  9 02:18:15 2018	(r334866)
+++ head/lib/Makefile	Sat Jun  9 02:25:18 2018	(r334867)
@@ -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

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Sat Jun  9 02:18:15 2018	(r334866)
+++ head/usr.sbin/Makefile	Sat Jun  9 02:25:18 2018	(r334867)
@@ -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