1.1 --- a/scripts/build/libc/glibc-eglibc.sh-common	Tue Jan 25 20:31:16 2011 +0100
     1.2 +++ b/scripts/build/libc/glibc-eglibc.sh-common	Mon Jan 31 19:52:18 2011 +0100
     1.3 @@ -29,6 +29,15 @@
     1.4      CT_DoLog DEBUG "Using ar for target: '${cross_ar}'"
     1.5      CT_DoLog DEBUG "Using ranlib for target: '${cross_ranlib}'"
     1.6  
     1.7 +    touch config.cache
     1.8 +    if [ "${CT_LIBC_GLIBC_FORCE_UNWIND}" = "y" ]; then
     1.9 +        echo "libc_cv_forced_unwind=yes" >>config.cache
    1.10 +        echo "libc_cv_c_cleanup=yes" >>config.cache
    1.11 +    fi
    1.12 +
    1.13 +    # Pre-seed the configparms file with values from the config option
    1.14 +    printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
    1.15 +
    1.16      BUILD_CC="${CT_BUILD}-gcc"                          \
    1.17      CC=${cross_cc}                                      \
    1.18      CXX=${cross_cxx}                                    \
    1.19 @@ -40,6 +49,7 @@
    1.20          --with-headers="${CT_HEADERS_DIR}"              \
    1.21          --build="${CT_BUILD}"                           \
    1.22          --host="${CT_TARGET}"                           \
    1.23 +        --cache-file="$(pwd)/config.cache"              \
    1.24          --disable-profile                               \
    1.25          --without-gd                                    \
    1.26          --without-cvs                                   \
    1.27 @@ -173,6 +183,12 @@
    1.28  
    1.29      extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}"
    1.30  
    1.31 +    touch config.cache
    1.32 +    if [ "${CT_LIBC_GLIBC_FORCE_UNWIND}" = "y" ]; then
    1.33 +        echo "libc_cv_forced_unwind=yes" >>config.cache
    1.34 +        echo "libc_cv_c_cleanup=yes" >>config.cache
    1.35 +    fi
    1.36 +
    1.37      # Pre-seed the configparms file with values from the config option
    1.38      printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
    1.39  
    1.40 @@ -194,7 +210,7 @@
    1.41      # Should this change in a future eglibc release, we'd better
    1.42      # directly mangle the generated scripts _after_ they get built,
    1.43      # or even after they get installed... eglibc is such a sucker...
    1.44 -    echo "ac_cv_path_BASH_SHELL=/bin/bash" >config.cache
    1.45 +    echo "ac_cv_path_BASH_SHELL=/bin/bash" >>config.cache
    1.46  
    1.47      # Configure with --prefix the way we want it on the target...
    1.48      # There are a whole lot of settings here.  You'll probably want
    1.49 @@ -214,10 +230,10 @@
    1.50          --prefix=/usr                                               \
    1.51          --build=${CT_BUILD}                                         \
    1.52          --host=${CT_TARGET}                                         \
    1.53 +        --cache-file="$(pwd)/config.cache"                          \
    1.54          --without-cvs                                               \
    1.55          --disable-profile                                           \
    1.56          --without-gd                                                \
    1.57 -        --cache-file=config.cache                                   \
    1.58          --with-headers="${CT_HEADERS_DIR}"                          \
    1.59          "${extra_config[@]}"                                        \
    1.60          ${CT_LIBC_GLIBC_EXTRA_CONFIG}