diff --git a/configure b/configure
index a6750ca7bd..4de8e9f346 100755
--- a/configure
+++ b/configure
@@ -579,7 +579,6 @@ HOST_HAIKU_PORTER=
 HAIKU_PORTS=
 HAIKU_PORTS_CROSS=
 HAIKU_IS_BOOTSTRAP=0
-HAIKU_BOOT_BOARD=
 HAIKU_NO_DOWNLOADS=0
 
 HAIKU_PACKAGING_ARCHS=
@@ -1001,33 +1000,31 @@ cat << EOF > "$buildConfigFile"
 #e ${configureEnvirons}
 #a ${configureArgs}
 
-TARGET_PLATFORM 			?= "${TARGET_PLATFORM}" ;
 HOST_PLATFORM				?= "${HOST_PLATFORM}" ;
-
-HAIKU_INCLUDE_SOURCES				?= "${HAIKU_INCLUDE_SOURCES}" ;
-HAIKU_INCLUDE_3RDPARTY				?= "${HAIKU_INCLUDE_3RDPARTY}" ;
-HAIKU_DISTRO_COMPATIBILITY			?= "${HAIKU_DISTRO_COMPATIBILITY}" ;
-HAIKU_USE_GCC_PIPE					?= "${HAIKU_USE_GCC_PIPE}" ;
-HAIKU_HOST_USE_32BIT				?= "${HAIKU_HOST_USE_32BIT}" ;
-HAIKU_HOST_USE_XATTR				?= "${HAIKU_HOST_USE_XATTR}" ;
-HAIKU_HOST_USE_XATTR_REF			?= "${HAIKU_HOST_USE_XATTR_REF}" ;
-HAIKU_HOST_BUILD_ONLY				?= "${HAIKU_HOST_BUILD_ONLY}" ;
-
+TARGET_PLATFORM 			?= "${TARGET_PLATFORM}" ;
 HAIKU_PACKAGING_ARCHS		?= ${HAIKU_PACKAGING_ARCHS} ;
 
 HAIKU_NO_DOWNLOADS			?= "${HAIKU_NO_DOWNLOADS}" ;
+HAIKU_INCLUDE_SOURCES		?= "${HAIKU_INCLUDE_SOURCES}" ;
+HAIKU_INCLUDE_3RDPARTY		?= "${HAIKU_INCLUDE_3RDPARTY}" ;
+HAIKU_DISTRO_COMPATIBILITY	?= "${HAIKU_DISTRO_COMPATIBILITY}" ;
 
-HAIKU_BUILD_ATTRIBUTES_DIR	?= ${HAIKU_BUILD_ATTRIBUTES_DIR} ;
+HAIKU_USE_GCC_PIPE			?= "${HAIKU_USE_GCC_PIPE}" ;
+HAIKU_HOST_USE_32BIT		?= "${HAIKU_HOST_USE_32BIT}" ;
+HAIKU_HOST_USE_XATTR		?= "${HAIKU_HOST_USE_XATTR}" ;
+HAIKU_HOST_USE_XATTR_REF	?= "${HAIKU_HOST_USE_XATTR_REF}" ;
+HAIKU_HOST_BUILD_ONLY		?= "${HAIKU_HOST_BUILD_ONLY}" ;
 
-HAIKU_NASM					?= ${HAIKU_NASM} ;
-HAIKU_BOOT_BOARD			?= ${HAIKU_BOOT_BOARD} ;
-
-HOST_EXTENDED_REGEX_SED		?= ${HOST_EXTENDED_REGEX_SED} ;
+HOST_CC						?= ${CC} ;
 HOST_GCC_RAW_VERSION		?= ${HOST_GCC_RAW_VERSION} ;
 HOST_GCC_MACHINE			?= ${HOST_GCC_MACHINE} ;
 HOST_LD						?= ${HOST_GCC_LD} ;
 HOST_OBJCOPY				?= ${HOST_GCC_OBJCOPY} ;
+HOST_EXTENDED_REGEX_SED		?= ${HOST_EXTENDED_REGEX_SED} ;
 HOST_SHA256					?= ${HOST_SHA256} ;
+HAIKU_NASM					?= ${HAIKU_NASM} ;
+
+HAIKU_BUILD_ATTRIBUTES_DIR	?= ${HAIKU_BUILD_ATTRIBUTES_DIR} ;
 
 HOST_HAIKU_PORTER			?= ${HOST_HAIKU_PORTER} ;
 HAIKU_PORTS					?= ${HAIKU_PORTS} ;