diff --git a/Makefile b/Makefile
index ebc5e3a..2836b84 100644
--- a/Makefile
+++ b/Makefile
@@ -126,9 +126,9 @@ $(call ensure_binary,$(PKG_CONFIG))
 
 override CFLAGS += -std=c++11 -Wall -Wextra -pedantic -O2 -g
 
-GCC_4_2_OR_HIGHER := $(shell expr `$(CXX) -dumpversion | sed 's/\.//g'` \>= 420)
-ifeq "$(GCC_4_2_OR_HIGHER)" "1"
-    CFLAGS += -march=native
+ifeq ($(ARCH),i386)
+  override CFLAGS += -m32
+  override LFLAGS += -m32
 endif
 
 DEFINES = -DFUSE_USE_VERSION=26
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3b6feba..1e971ea 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -28,7 +28,6 @@ services:
       - *src-volume
       - linux-gcc-32:/build
     environment:
-      - CFLAGS=-m32
       - ARCH=i386
 
   linux-gcc-64: