diff --git a/helpers/cross-compilation.sh b/helpers/cross-compilation.sh
index 92bc470f958..5133ab82e81 100644
--- a/helpers/cross-compilation.sh
+++ b/helpers/cross-compilation.sh
@@ -13,6 +13,11 @@ for bin in gcc g++ cpp ar as ranlib ld strip; do
 done
 
 SAVE_PATH="$PATH"
+if [ "$xbps_machine" = "x86_64" ]; then
+	XBPS_CROSS_HOST="x86_64-unknown-linux-gnu"
+else
+	XBPS_CROSS_HOST="$xbps_machine-pc-linux-gnu"
+fi
 
 cross_compile_setvars()
 {
diff --git a/xbps.sh b/xbps.sh
index ae02d5dd3d4..389d0aa01c0 100755
--- a/xbps.sh
+++ b/xbps.sh
@@ -32,7 +32,6 @@ trap "echo && exit 1" INT QUIT
 : ${progname:=$(basename $0)}
 : ${fetch_cmd:=wget}
 : ${xbps_machine:=$(uname -m)}
-: ${XBPS_CROSS_HOST:=$xbps_machine-pc-linux-gnu}
 
 usage()
 {
@@ -694,11 +693,6 @@ configure_src_phase()
 	if [ -n "$cross_compiler" ]; then
 		. $XBPS_HELPERSDIR/cross-compilation.sh
 		cross_compile_setvars
-	else
-		if [ "$build_style" = "gnu_configure" ]; then
-			configure_args="$configure_args --host=$XBPS_CROSS_HOST"
-			configure_args="$configure_args --build=$XBPS_CROSS_HOST"
-		fi
 	fi
 
 	# Run pre_configure helpers.