diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index cbf06abc647..ed0cbba43e3 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -13,10 +13,9 @@ homepage="http://developer.android.com/tools/help/adb.html"
 distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
 checksum=5428e16a2baba79665cac0b11be81aa0cfa6920dc20da039711cc3d3b96a333b
 
-case "$XBPS_TARGET_MACHINE" in
-	armv[56]*) makedepends+=" libatomic-devel"
-		;;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
 
 pre_configure() {
 	# Don't check for CROSS_COMPILING, since i686 container/chroot inside
@@ -33,11 +32,10 @@ pre_configure() {
 		configure_args+=" ${boring_ssl_cmake_args}"
 	fi
 
-	case "${XBPS_TARGET_MACHINE}" in
-		armv[56]*) sed -i vendor/CMakeLists.adb.txt \
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		sed -i vendor/CMakeLists.adb.txt \
 			-e "/target_link_libraries/s;$; atomic;"
-			;;
-	esac
+	fi
 }
 
 post_install() {