Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

diff --git a/all b/all
index 93edeb54da7feda71f7ad559162d4f2c78481f74..d022eb0d31b0801ffdf9c0ba4f07936e1b40769e 100755 (executable)
--- a/all
+++ b/all
@@ -800,7 +800,17 @@ case "$cmd" in
                                        ;;
                                -r)
                                        debug=release
-                                       export CC="$CC -g -mtune=native -march=native"
+                                       export CC="$CC -g"
+                                       case "`$CC -dumpversion`" in
+                                               [5-9]*|[1-9][0-9]*|4.[3-9]*|4.[1-9][0-9]*)
+                                                       # gcc 4.3 or higher
+                                                       # -march=native is broken < 4.3
+                                                       export CC="$CC -mtune=native -march=native"
+                                                       ;;
+                                       esac
+                                       if [ -n "$WE_HATE_OUR_USERS" ]; then
+                                               export CC="$CC -fno-common"
+                                       fi
                                        shift
                                        ;;
                                *)
@@ -821,7 +831,7 @@ case "$cmd" in
                                        TARGETS="sv-$debug sdl-$debug"
                                        ;;
                        esac
-                       export CC="$CC -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
+                       export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                else
                        TARGETS="sv-$debug cl-$debug sdl-$debug"
                fi