svn commit: r335216 - head

[Bryan Drewery]

Author: bdrewery
Date: Fri Jun 15 16:48:09 2018
New Revision: 335216
URL: https://svnweb.freebsd.org/changeset/base/335216

Log:
  Only build jevents if MK_PMC is yes and only for amd64 in libcompat.
  
  Sponsored by:	Dell EMC

Modified:
  head/Makefile.inc1
  head/Makefile.libcompat

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Jun 15 16:41:28 2018	(r335215)
+++ head/Makefile.inc1	Fri Jun 15 16:48:09 2018	(r335216)
@@ -2033,7 +2033,8 @@ _tcsh=bin/csh
 _libmagic=lib/libmagic
 .endif
 
-.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
+.if ${MK_PMC} != "no" && \
+    (${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386")
 _jevents=lib/libpmc/pmu-events
 .endif
 

Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat	Fri Jun 15 16:41:28 2018	(r335215)
+++ head/Makefile.libcompat	Fri Jun 15 16:48:09 2018	(r335216)
@@ -155,6 +155,11 @@ _LC_INCDIRS=	\
 		lib/ncurses/ncursesw \
 		${_LC_LIBDIRS.yes}
 
+.if ${MK_PMC} != "no" && ${TARGET_ARCH} == "amd64"
+_jevents=	lib/libpmc/pmu-events
+.endif
+
+
 # Shared logic
 build${libcompat}: .PHONY
 	@echo
@@ -192,7 +197,7 @@ build${libcompat}: .PHONY
 	    DIRPRFX=${_dir}/ ${_t}
 .endfor
 .endfor
-.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic lib/libpmc/pmu-events
+.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic ${_jevents}
 	${_+_}cd ${.CURDIR}/${_dir}; \
 	    WORLDTMP=${WORLDTMP} \
 	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \