From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 6 Apr 2018 14:56:52 +0000 (-0400)
Subject: Stop using libd0_blind_id binaries on Linux x86_64 for ./all compile.
X-Git-Tag: xonotic-v0.8.5~172
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6877526bc70571937c52f01b6be952e3bb491118;p=xonotic%2Fxonotic.git

Stop using libd0_blind_id binaries on Linux x86_64 for ./all compile.
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 570305f8..1bd94099 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -195,16 +195,6 @@ case "$cmd" in
 				case "`uname`" in
 					Linux)
 						case `uname -m` in
-							x86_64)
-								# No cp commands, we want to use static linking instead.
-								export CC="$CC -I../../../../misc/builddeps/linux64/d0_blind_id/include"
-								export CC="$CC -L../../../../misc/builddeps/linux64/d0_blind_id/lib"
-								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux64/d0_blind_id/lib"
-								export CC="$CC -I../../../../misc/builddeps/linux64/gmp/include"
-								export CC="$CC -L../../../../misc/builddeps/linux64/gmp/lib"
-								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux64/gmp/lib"
-								MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/linux64/d0_blind_id/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/linux64/gmp/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/linux64/d0_blind_id/lib/libd0_rijndael.a"
-								;;
 							*86)
 								# No cp commands, we want to use static linking instead.
 								export CC="$CC -I../../../../misc/builddeps/linux32/d0_blind_id/include"
@@ -216,6 +206,7 @@ case "$cmd" in
 								MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/linux32/d0_blind_id/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/linux32/gmp/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/linux32/d0_blind_id/lib/libd0_rijndael.a"
 								;;
 							*)
+								msg "Always need to compile libd0_blind_id on Linux `uname -m`."
 								compiled0=true
 								;;
 						esac
@@ -225,6 +216,7 @@ case "$cmd" in
 						verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael".* .libs/
 						;;
 					*)
+						msg "Always need to compile libd0_blind_id on `uname`."
 						compiled0=true
 						;;
 				esac