diff --git a/srcpkgs/ahoviewer/template b/srcpkgs/ahoviewer/template
index d70b8c19a0..a231be63f6 100644
--- a/srcpkgs/ahoviewer/template
+++ b/srcpkgs/ahoviewer/template
@@ -17,18 +17,14 @@ distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=a14e32b4a8095c9f8b4b607c090a50cc8ac1076550e57b5a9303c54089068152
 nocross="https://travis-ci.org/void-linux/void-packages/jobs/490108528#L1022"
 
-case "$XBPS_TARGET_MACHINE" in
-	ppc64*) ;;
-	armv6*|ppc*) makedepends+=" libatomic-devel";;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
 
 post_patch() {
-	case "$XBPS_TARGET_MACHINE" in
-		ppc64*) ;;
-		armv6*|ppc*)
-			echo "ahoviewer_LDADD += -latomic" >> src/Makefile.am
-			;;
-	esac
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		echo "ahoviewer_LDADD += -latomic" >> src/Makefile.am
+	fi
 }
 
 pre_configure() {