diff --git a/tools/configure b/tools/configure
index 7c41a0b..b7ef9a2 100755
--- a/tools/configure
+++ b/tools/configure
@@ -40,7 +40,12 @@ prefixtools () {
 }
 
 findarmgcc() {
-  if [ "$ARG_ARM_EABI" = "1" ]; then
+  # remove modelname checks when all ARM are changed to eabi
+  if [ "$ARG_ARM_EABI" = "1" ] \
+        || [ -z "$ARG_ARM_EABI" ] \
+        && ( [ "$modelname" = "sansafuzev2" ] \
+            || [ "$modelname" = "sansafuze" ] \
+            || [ "$modelname" = "sansaclip" ] ); then
     prefixtools arm-elf-eabi-
     gccchoice="4.4.4"
   else