diff --git a/sc2/build/unix/build_functions b/sc2/build/unix/build_functions
index 53f63d022..5c31d4cde 100644
--- a/sc2/build/unix/build_functions
+++ b/sc2/build/unix/build_functions
@@ -46,6 +46,7 @@ EOF
 # Start the configure program.
 # $1 = target
 build_config() {
+	set_system
 	prepare_build_system
 	config_requirements
 	prepare_host_system
diff --git a/sc2/build/unix/config_functions b/sc2/build/unix/config_functions
index 37f3f4536..135c85b52 100644
--- a/sc2/build/unix/config_functions
+++ b/sc2/build/unix/config_functions
@@ -970,14 +970,17 @@ EOF
 
 }
 
-prepare_build_system() {
+set_system() {
 	set_build_system
+	set_host_system
+}
+
+prepare_build_system() {
 	# Include information about programs we can detect for the build system.
 	. build/unix/config_proginfo_build
 }
 
 prepare_host_system() {
-	set_host_system
 	# Include information about programs we can detect for the host system.
 	. build/unix/config_proginfo_host
 }