diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-05-22 22:38:37 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-05-22 22:38:37 (GMT) |
| commit | c68aacb799562c91ab9c6a8ffe68d2a7874cd3ee (patch) | |
| tree | bef0e008cbfd72c73a5551c0eab5c38a45db26bc /scripts/build/cc_gcc.sh | |
| parent | 9d2e7e0b704e4f905c5872fbc7613182e10c180e (diff) | |
Improve handling of __cxa_atexit by Arnaud Vrac <rawoul at zogzog dot org>.
/trunk/scripts/build/cc_gcc.sh | 18 15 3 0 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
Diffstat (limited to 'scripts/build/cc_gcc.sh')
| -rw-r--r-- | scripts/build/cc_gcc.sh | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/scripts/build/cc_gcc.sh b/scripts/build/cc_gcc.sh index 7818173..10ca022 100644 --- a/scripts/build/cc_gcc.sh +++ b/scripts/build/cc_gcc.sh @@ -59,8 +59,12 @@ do_cc_core_static() { CT_DoLog EXTRA "Configuring static core C compiler" extra_config="${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}" - [ "${CT_CC_CXA_ATEXIT}" = "y" ] && extra_config="${extra_config} --enable-__cxa_atexit" [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" + if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then + extra_config="${extra_config} --enable-__cxa_atexit" + else + extra_config="${extra_config} --disable-__cxa_atexit" + fi CT_DoLog DEBUG "Extra config passed: '${extra_config}'" @@ -114,8 +118,12 @@ do_cc_core_shared() { CT_DoLog EXTRA "Configuring shared core C compiler" extra_config="${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}" - [ "${CT_CC_CXA_ATEXIT}" = "y" ] && extra_config="${extra_config} --enable-__cxa_atexit" [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" + if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then + extra_config="${extra_config} --enable-__cxa_atexit" + else + extra_config="${extra_config} --disable-__cxa_atexit" + fi CT_DoLog DEBUG "Extra config passed: '${extra_config}'" @@ -215,7 +223,11 @@ do_cc() { extra_config="--enable-languages=${lang_opt}" extra_config="${extra_config} ${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}" [ "${CT_SHARED_LIBS}" = "y" ] || extra_config="${extra_config} --disable-shared" - [ "${CT_CC_CXA_ATEXIT}" == "y" ] && extra_config="${extra_config} --enable-__cxa_atexit" + if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then + extra_config="${extra_config} --enable-__cxa_atexit" + else + extra_config="${extra_config} --disable-__cxa_atexit" + fi if [ "${CT_TARGET_MULTILIB}" = "y" ]; then extra_config="${extra_config} --enable-multilib" else |