Merge branch 'master' into matthiaskrgr/all_grep

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index b6f40abeb594a4db9608feb93f903aa92a0dd638..0379abdc9b0a8473f198514ffbe069ad9e95584c 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -122,6 +122,14 @@ case "$cmd" in
                        fi
                fi
 
+               # workaround ARM issue in DP's makefile.inc
+               case `uname -m` in
+                       x86_64|*86)
+                               ;;
+                       *)
+                               MAKEFLAGS="$MAKEFLAGS CFLAGS_SSE= CFLAGS_SSE2="
+                               ;;
+               esac
                
                if ! verbose $CC misc/tools/conftest.c -o conftest; then
                        msg ""