diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 9f3406aa800..029ba8468f4 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -154,8 +154,13 @@ depend: $(ALL_SOURCES)
 
 
 subdirs:
-	@ (cd x86 ; $(MAKE))
-	@ (cd x86-64 ; $(MAKE))
+	@ if [ `echo $(ASM_FLAGS) | grep USE_X86_ASM` ] ; then \
+		(cd x86 ; $(MAKE)) ; \
+	fi
+	@ if [ `echo $(ASM_FLAGS) | grep USE_X86_64_ASM` ] ; then \
+		(cd x86 ; $(MAKE)) ; \
+		(cd x86-64 ; $(MAKE)) ; \
+	fi
 
 
 install: default gl.pc