diff --git a/Makefile.libretro b/Makefile.libretro
index 51da9828..179223e4 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -27,7 +27,7 @@ STATIC_LINKING:= 0
 TARGET_NAME := picodrive
 LIBM := -lm
 GIT_VERSION ?= $(shell git rev-parse --short HEAD || echo unknown)
-ifneq ($(GIT_VERSION)," unknown")
+ifneq ($(GIT_VERSION),"unknown")
 	CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif
 
@@ -463,6 +463,9 @@ endif
 SHARED ?= -shared
 LDFLAGS += $(SHARED) $(fpic)
 
+ifneq ($(ARCH), arm)
+ARCH = $(shell $(CC) -dumpmachine | awk -F '-' '{print $$1}')
+endif
 PLATFORM = libretro
 NO_CONFIG_MAK = yes