# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1211496114 0
# Node ID a62cf50e2d86f19167827c3505b91bea13797bba
# Parent  41a81837fa5412a96bbe6ad322d324cd032332c2
Backport #661 from trunk:
  Improve handling of __cxa_atexit.

 /branches/1.1/scripts/build/cc_gcc.sh |   18    15     3     0 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff -r 41a81837fa54 -r a62cf50e2d86 scripts/build/cc_gcc.sh
--- a/scripts/build/cc_gcc.sh	Wed May 21 21:56:34 2008 +0000
+++ b/scripts/build/cc_gcc.sh	Thu May 22 22:41:54 2008 +0000
@@ -59,8 +59,12 @@
     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 @@
     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 @@
     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