X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=9af0b7c4db9ad5be1d24b378aa8c7ce1e5f6580c;hb=9ab8f62f7df361e8b731220c9cf8b9079ae4a39d;hp=29928197ae8b4fdd86e78f6da91f23982c8b0e6d;hpb=424371fc875a01260b08ed89336293b6281f38be;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index 29928197..9af0b7c4 100755
--- a/all
+++ b/all
@@ -380,7 +380,7 @@ fix_upstream_rebase_mergefail()
 
 fix_git_config()
 {
-	if ! [ -d ".git" ]; then
+	if ! [ -f ".git/config" ]; then
 		$ECHO "Not a git repository. Bailing out to not cause damage."
 		exit 1
 	fi
@@ -520,7 +520,7 @@ case "$cmd" in
 			url=`repourl "$d"`
 			pushurl=`repopushurl "$d"`
 			branch=`repobranch "$d"`
-			if [ -d "$d0/$d" ]; then
+			if [ -f "$d0/$d/.git/config" ]; then
 				verbose cd "$d0/$d"
 				fix_git_config "$url" "$pushurl"
 				cd "$d0"
@@ -698,7 +698,7 @@ case "$cmd" in
 			url=`repourl "$d"`
 			pushurl=`repopushurl "$d"`
 			branch=`repobranch "$d"`
-			if [ -d "$d0/$d" ]; then
+			if [ -f "$d0/$d/.git/config" ]; then
 				# if we have .no file, skip
 				if [ -f "$d0/$d.no" ]; then
 					msg "Repository $d disabled by a .no file, delete $d.no to enable; thus, not updated"
@@ -726,6 +726,14 @@ case "$cmd" in
 					cd "$d0"
 				fi
 			else
+				if [ -d "$d0/$d" ]; then
+					if yesno "$d0/$d is in the way, get rid of it and reclone?"; then
+						verbose rm -rf "$d0/$d"
+					else
+						echo "Note: $d0/$d will stay broken."
+						continue
+					fi
+				fi
 				verbose git clone "$url" "$d0/$d"
 				enter "$d0/$d" verbose
 				fix_git_config "$url" "$pushurl"
@@ -955,7 +963,9 @@ case "$cmd" 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"
+							if $CC -mtune=native -march=native misc/tools/conftest.c -o conftest >/dev/null 2>&1; then
+								export CC="$CC -mtune=native -march=native"
+							fi
 							;;
 					esac
 					if [ -n "$WE_HATE_OUR_USERS" ]; then
@@ -1025,7 +1035,7 @@ case "$cmd" in
 		fi
 		if [ -z "$MAKEFLAGS" ]; then
 			if [ -f /proc/cpuinfo ]; then
-				ncpus=$((`grep -c '^processor	:' /proc/cpuinfo`+0))
+				ncpus=$((`grep -c '^processor	:' /proc/cpuinfo || true`+0))
 				if [ $ncpus -gt 1 ]; then
 					MAKEFLAGS=-j$ncpus
 				fi
@@ -1035,6 +1045,33 @@ case "$cmd" in
 			fi
 		fi
 
+		
+		if ! verbose $CC misc/tools/conftest.c -o conftest; then
+			msg ""
+			msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+			msg "~~~~~~~~~~ COMPILER ~~~~~~~~~~"
+			msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+			msg "~~~~~~~~~~~~~~_...._~~~~~~~~~~"
+			msg "~~~~~~~~~~~,-'     \\\`-._~~~~~~"
+			msg "~~~~~~~~~~/     --. ><  \\~~~~~"
+			msg "~~~~~~~~~/      (*)> -<: \\~~~~"
+			msg "~~~~~~~~~(     ^~-'  (*) )~~~~"
+			msg "~~~~~~~~~\\        ^+-_/  |~~~~"
+			msg "~~~~~~~~~~\\       {vvv}  |~~~~"
+			msg "~~~~~~~~~~,\\    , {^^^},/~~~~~"
+			msg "~~~~~~~~,/  \`---.....-'~~W~~~~"
+			msg "~~~~~~,/   \\_____/_\\_W~~/~~~~~"
+			msg "~~~~~/          /~~~\\__/~~~~~~"
+			msg "~~~~/          /~~~~~~~~~~~~~~"
+			msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+			msg "~~~~~~~ Y U NO COMPILE ~~~~~~~"
+			msg "~~~~~~~~~~~~ CODE ~~~~~~~~~~~~"
+			msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+			msg ""
+			exit 1
+		fi
+		rm -f conftest
+
 		verbose cd "$d0/d0_blind_id"
 		if ! $compiled0; then
 			# compilation of crypto library failed