diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 4a7ad49c5f6..083be91b941 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -13,10 +13,9 @@ homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
 checksum=12b0e4504b8ed1bc351c75d8d17136c7bc169ce59705fd0dde562492185f1381
 
-case "$XBPS_TARGET_MACHINE" in
-	ppc64*) ;;
-	armv6*|ppc*) makedepends+=" libatomic-devel";;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
 
 pre_build() {
 	if [ "$CROSS_BUILD" ];then
@@ -24,11 +23,10 @@ pre_build() {
 			-e "/conf = env.Configure()/ a env.Replace(CC = \"$CC\")" \
 			-e "/conf = env.Configure()/ a env.Replace(CXX = \"$CXX\")"
 	fi
-	case $XBPS_TARGET_MACHINE in
-		ppc64*) ;;
-		armv6*|ppc*) vsed -i SConstruct \
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		vsed -i SConstruct \
 			-e "/conf = env.Configure()/ a env.Append(LIBS='atomic')"
-	esac
+	fi
 }
 
 do_install() {