diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 1f0c6640d80..8084c708716 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -294,7 +294,7 @@ SUBDIR.${MK_VT}+=	vtfontcvt
 SUBDIR.${MK_USB}+=	usbhidaction
 SUBDIR.${MK_USB}+=	usbhidctl
 SUBDIR.${MK_UTMPX}+=	last
-.if ${MACHINE_CPUARCH} != "riscv" # RISCVTODO users does not build
+.if ${MK_CXX} != "no"
 SUBDIR.${MK_UTMPX}+=	users
 .endif
 SUBDIR.${MK_UTMPX}+=	who