diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-08-19 17:52:04 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-08-19 17:52:04 (GMT) |
| commit | 4de6139e7ed8927c1d7c3f72f5efae697a3bd7ca (patch) | |
| tree | 9bd09638b85d7ad2d3aaaf4b8d4f308b0f3433cf /scripts/build/debug/100-dmalloc.sh | |
| parent | 9d1cbf2b4145a6ff0ac4834be3459320b35ee7a0 (diff) | |
| parent | 83a48e12f08e375bddd42ca27eab4896234a42b8 (diff) | |
Merge the bash_array branch.
For every components where it makes sense, use bash arrays (instead
of a string with space-separated values) to store the options pased
to ./configure.
Diffstat (limited to 'scripts/build/debug/100-dmalloc.sh')
| -rw-r--r-- | scripts/build/debug/100-dmalloc.sh | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/scripts/build/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh index 2c5d80c..f95a36d 100644 --- a/scripts/build/debug/100-dmalloc.sh +++ b/scripts/build/debug/100-dmalloc.sh @@ -10,27 +10,28 @@ do_debug_dmalloc_extract() { } do_debug_dmalloc_build() { + local -a extra_config + CT_DoStep INFO "Installing dmalloc" CT_DoLog EXTRA "Configuring dmalloc" mkdir -p "${CT_BUILD_DIR}/build-dmalloc" cd "${CT_BUILD_DIR}/build-dmalloc" - extra_config= case "${CT_CC_LANG_CXX}" in - y) extra_config="${extra_config} --enable-cxx";; - *) extra_config="${extra_config} --disable-cxx";; + y) extra_config+=("--enable-cxx");; + *) extra_config+=("--disable-cxx");; esac case "${CT_THREADS_NONE}" in - y) extra_config="${extra_config} --disable-threads";; - *) extra_config="${extra_config} --enable-threads";; + y) extra_config+=("--disable-threads");; + *) extra_config+=("--enable-threads");; esac case "${CT_SHARED_LIBS}" in - y) extra_config="${extra_config} --enable-shlib";; - *) extra_config="${extra_config} --disable-shlib";; + y) extra_config+=("--enable-shlib");; + *) extra_config+=("--disable-shlib");; esac - CT_DoLog DEBUG "Extra config passed: '${extra_config}'" + CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" LD="${CT_TARGET}-ld" \ AR="${CT_TARGET}-ar" \ @@ -40,7 +41,7 @@ do_debug_dmalloc_build() { --prefix=/usr \ --build="${CT_BUILD}" \ --host="${CT_TARGET}" \ - ${extra_config} + "${extra_config[@]}" CT_DoLog EXTRA "Building dmalloc" CT_DoExecLog ALL make |