diff --git a/Makefile b/Makefile
index 486e4d01..f6ae8a5a 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,8 @@ ifeq "$(ASAN)" "1"
 else
 ifeq "$(DEBUG)" "0"
 	CFLAGS += -O3 -DNDEBUG
+else
+	CFLAGS += -O1
 endif
 endif
 	LD = $(CC)
diff --git a/configure b/configure
index e73c6959..deb9b75c 100755
--- a/configure
+++ b/configure
@@ -221,7 +221,7 @@ fi
 #fi
 
 if [ -z "$ARCH" ]; then
-  ARCH=`$CC -dumpmachine | awk -F '-' '{print $1}'`
+  ARCH=`$CC $MFLAGS $CFLAGS -dumpmachine | awk -F '-' '{print $1}'`
 fi
 
 # CPU/ABI stuff first, else compile test may fail