1.1 --- a/scripts/crosstool-NG.sh.in	Wed May 18 23:00:46 2011 +0200
     1.2 +++ b/scripts/crosstool-NG.sh.in	Thu May 19 22:29:49 2011 +0200
     1.3 @@ -22,7 +22,7 @@
     1.4  
     1.5  # Parse the configuration file
     1.6  # It has some info about the logging facility, so include it early
     1.7 -. .config
     1.8 +. .config.2
     1.9  # Yes! We can do full logging from now on!
    1.10  
    1.11  # Overide the locale early, in case we ever translate crosstool-NG messages
    1.12 @@ -103,6 +103,8 @@
    1.13  # Log real begining of build, now
    1.14  CT_DoLog INFO "Build started ${CT_STAR_DATE_HUMAN}"
    1.15  
    1.16 +# We really need to extract from ,config and not .config.2, as we
    1.17 +# do want the kconfig's values, not our mangled config with arrays.
    1.18  CT_DoStep DEBUG "Dumping user-supplied crosstool-NG configuration"
    1.19  CT_DoExecLog DEBUG grep -E '^(# |)CT_' .config
    1.20  CT_EndStep
    1.21 @@ -138,7 +140,7 @@
    1.22  
    1.23  # Kludge: If any of the configured options needs CT_TARGET,
    1.24  # then rescan the options file now:
    1.25 -. .config
    1.26 +. .config.2
    1.27  
    1.28  # Sanity check some directories
    1.29  CT_TestAndAbort "'CT_PREFIX_DIR' is not set: where should I install?" -z "${CT_PREFIX_DIR}"
    1.30 @@ -485,6 +487,8 @@
    1.31      [ ${CT_PARALLEL_JOBS} -ne 0 ] && JOBSFLAGS="${JOBSFLAGS} -j${CT_PARALLEL_JOBS}"
    1.32      [ ${CT_LOAD} -ne 0 ] && JOBSFLAGS="${JOBSFLAGS} -l${CT_LOAD}"
    1.33  
    1.34 +    # We need to save the real .config with kconfig's value,
    1.35 +    # not our mangled .config.2 with arrays.
    1.36      CT_DoLog EXTRA "Installing user-supplied crosstool-NG configuration"
    1.37      CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin"
    1.38      CT_DoExecLog DEBUG install -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"