diff -r a559d9890c02 -r 165eff2a1e10 scripts/build/libc/glibc-eglibc.sh-common --- a/scripts/build/libc/glibc-eglibc.sh-common Tue Jan 25 20:31:16 2011 +0100 +++ b/scripts/build/libc/glibc-eglibc.sh-common Mon Jan 31 19:52:18 2011 +0100 @@ -29,6 +29,15 @@ CT_DoLog DEBUG "Using ar for target: '${cross_ar}'" CT_DoLog DEBUG "Using ranlib for target: '${cross_ranlib}'" + touch config.cache + if [ "${CT_LIBC_GLIBC_FORCE_UNWIND}" = "y" ]; then + echo "libc_cv_forced_unwind=yes" >>config.cache + echo "libc_cv_c_cleanup=yes" >>config.cache + fi + + # Pre-seed the configparms file with values from the config option + printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms + BUILD_CC="${CT_BUILD}-gcc" \ CC=${cross_cc} \ CXX=${cross_cxx} \ @@ -40,6 +49,7 @@ --with-headers="${CT_HEADERS_DIR}" \ --build="${CT_BUILD}" \ --host="${CT_TARGET}" \ + --cache-file="$(pwd)/config.cache" \ --disable-profile \ --without-gd \ --without-cvs \ @@ -173,6 +183,12 @@ extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}" + touch config.cache + if [ "${CT_LIBC_GLIBC_FORCE_UNWIND}" = "y" ]; then + echo "libc_cv_forced_unwind=yes" >>config.cache + echo "libc_cv_c_cleanup=yes" >>config.cache + fi + # Pre-seed the configparms file with values from the config option printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms @@ -194,7 +210,7 @@ # Should this change in a future eglibc release, we'd better # directly mangle the generated scripts _after_ they get built, # or even after they get installed... eglibc is such a sucker... - echo "ac_cv_path_BASH_SHELL=/bin/bash" >config.cache + echo "ac_cv_path_BASH_SHELL=/bin/bash" >>config.cache # Configure with --prefix the way we want it on the target... # There are a whole lot of settings here. You'll probably want @@ -214,10 +230,10 @@ --prefix=/usr \ --build=${CT_BUILD} \ --host=${CT_TARGET} \ + --cache-file="$(pwd)/config.cache" \ --without-cvs \ --disable-profile \ --without-gd \ - --cache-file=config.cache \ --with-headers="${CT_HEADERS_DIR}" \ "${extra_config[@]}" \ ${CT_LIBC_GLIBC_EXTRA_CONFIG}