Skip to content

Commit

Permalink
Only build jevents if MK_PMC is yes and only for amd64 in libcompat.
Browse files Browse the repository at this point in the history 
Sponsored by:	Dell EMC
  • Loading branch information
@bdrewery
bdrewery committed Jun 15, 2018
1 parent ad2afa8 commit 6f1f2b1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Makefile.inc1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 6 additions & 1 deletion Makefile.libcompat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}" \
Expand Down

0 comments on commit 6f1f2b1

Please sign in to comment.