diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-08-19 19:44:42 +0200 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-08-19 19:44:42 +0200 |
| commit | 25303fc30a58d62b14c5d7cdd04004e783c7667e (patch) | |
| tree | 7180576c0eb3adb0b8edabaf2ddc0b771437871b | |
| parent | f255716872aa7284bdcf3f28f7377b6c671c8f54 (diff) | |
| download | crosstool-ng-25303fc30a58d62b14c5d7cdd04004e783c7667e.tar.gz crosstool-ng-25303fc30a58d62b14c5d7cdd04004e783c7667e.tar.bz2 crosstool-ng-25303fc30a58d62b14c5d7cdd04004e783c7667e.zip | |
Make dmalloc's extra_config an array containing ./configure options
Change extra_config from a string to a array of options.
| -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 2c5d80c7..f95a36da 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 |