diff --git a/support/configure.inc b/support/configure.inc
index 6b2dcece..ecb85da4 100644
--- a/support/configure.inc
+++ b/support/configure.inc
@@ -9,6 +9,8 @@
 # Defaults
 # ###########################################################################
 
+CONFIGURE_ARGS="$*"
+
 # System setup
 [ -z "$PLATFORM" ] && PLATFORM=linux
 [ -z "$CPU"      ] && CPU=generic
@@ -460,11 +462,12 @@ function write_config
 	CONFIG_MK=${ROOTDIR}/.config.mk
   cat > ${CONFIG_MK} <<EOF
 # Automatically generated by configure - DO NOT EDIT!
-CONFIGURE_ARGS = ${BASH_ARGV[*]}
+CONFIGURE_ARGS = ${CONFIGURE_ARGS}
 ROOTDIR  ?= ${ROOTDIR}
 BUILDDIR ?= ${ROOTDIR}/build.${PLATFORM}
 OSENV    ?= ${OSENV}
 ARCH     ?= ${ARCH}
+CPU      ?= ${CPU}
 ifeq (\$(origin CC),default)
 CC        = ${CC}
 endif