1.1 --- a/scripts/build/debug/100-dmalloc.sh Tue Mar 03 17:41:59 2009 +0000
1.2 +++ b/scripts/build/debug/100-dmalloc.sh Sat Sep 26 12:45:07 2009 +0200
1.3 @@ -10,27 +10,28 @@
1.4 }
1.5
1.6 do_debug_dmalloc_build() {
1.7 + local -a extra_config
1.8 +
1.9 CT_DoStep INFO "Installing dmalloc"
1.10 CT_DoLog EXTRA "Configuring dmalloc"
1.11
1.12 mkdir -p "${CT_BUILD_DIR}/build-dmalloc"
1.13 cd "${CT_BUILD_DIR}/build-dmalloc"
1.14
1.15 - extra_config=
1.16 case "${CT_CC_LANG_CXX}" in
1.17 - y) extra_config="${extra_config} --enable-cxx";;
1.18 - *) extra_config="${extra_config} --disable-cxx";;
1.19 + y) extra_config+=("--enable-cxx");;
1.20 + *) extra_config+=("--disable-cxx");;
1.21 esac
1.22 case "${CT_THREADS_NONE}" in
1.23 - y) extra_config="${extra_config} --disable-threads";;
1.24 - *) extra_config="${extra_config} --enable-threads";;
1.25 + y) extra_config+=("--disable-threads");;
1.26 + *) extra_config+=("--enable-threads");;
1.27 esac
1.28 case "${CT_SHARED_LIBS}" in
1.29 - y) extra_config="${extra_config} --enable-shlib";;
1.30 - *) extra_config="${extra_config} --disable-shlib";;
1.31 + y) extra_config+=("--enable-shlib");;
1.32 + *) extra_config+=("--disable-shlib");;
1.33 esac
1.34
1.35 - CT_DoLog DEBUG "Extra config passed: '${extra_config}'"
1.36 + CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
1.37
1.38 LD="${CT_TARGET}-ld" \
1.39 AR="${CT_TARGET}-ar" \
1.40 @@ -40,7 +41,7 @@
1.41 --prefix=/usr \
1.42 --build="${CT_BUILD}" \
1.43 --host="${CT_TARGET}" \
1.44 - ${extra_config}
1.45 + "${extra_config[@]}"
1.46
1.47 CT_DoLog EXTRA "Building dmalloc"
1.48 CT_DoExecLog ALL make