| 1 |
vapier 08/04/22 05:53:03 |
| 2 |
|
| 3 |
Modified: toolchain.eclass |
| 4 |
Log: |
| 5 |
shuffle around code to better match when configure options are actually used |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.353 eclass/toolchain.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.353&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.353&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.352&r2=1.353 |
| 13 |
|
| 14 |
Index: toolchain.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
| 17 |
retrieving revision 1.352 |
| 18 |
retrieving revision 1.353 |
| 19 |
diff -u -r1.352 -r1.353 |
| 20 |
--- toolchain.eclass 12 Apr 2008 22:54:40 -0000 1.352 |
| 21 |
+++ toolchain.eclass 22 Apr 2008 05:53:02 -0000 1.353 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2008 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.352 2008/04/12 22:54:40 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.353 2008/04/22 05:53:02 vapier Exp $ |
| 27 |
# |
| 28 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 29 |
|
| 30 |
@@ -1167,8 +1167,7 @@ |
| 31 |
;; |
| 32 |
# Enable sjlj exceptions for backward compatibility on hppa |
| 33 |
hppa) |
| 34 |
- [[ ${GCC_PV:0:1} == "3" ]] && \ |
| 35 |
- confgcc="${confgcc} --enable-sjlj-exceptions" |
| 36 |
+ [[ ${GCCMAJOR} == "3" ]] && confgcc="${confgcc} --enable-sjlj-exceptions" |
| 37 |
;; |
| 38 |
esac |
| 39 |
|
| 40 |
@@ -1248,13 +1247,11 @@ |
| 41 |
fi |
| 42 |
|
| 43 |
# reasonably sane globals (hopefully) |
| 44 |
- # --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details |
| 45 |
confgcc="${confgcc} \ |
| 46 |
--with-system-zlib \ |
| 47 |
--disable-checking \ |
| 48 |
--disable-werror \ |
| 49 |
- --enable-secureplt \ |
| 50 |
- --disable-libunwind-exceptions" |
| 51 |
+ --enable-secureplt" |
| 52 |
|
| 53 |
# etype specific configuration |
| 54 |
einfo "running ${ETYPE}-configure" |
| 55 |
@@ -1299,21 +1296,17 @@ |
| 56 |
[[ ${CTARGET} == *-elf ]] && confgcc="${confgcc} --with-newlib" |
| 57 |
# __cxa_atexit is "essential for fully standards-compliant handling of |
| 58 |
# destructors", but apparently requires glibc. |
| 59 |
- # --enable-sjlj-exceptions : currently the unwind stuff seems to work |
| 60 |
- # for statically linked apps but not dynamic |
| 61 |
- # so use setjmp/longjmp exceptions by default |
| 62 |
if [[ ${CTARGET} == *-uclibc* ]] ; then |
| 63 |
confgcc="${confgcc} --disable-__cxa_atexit --enable-target-optspace" |
| 64 |
- [[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && \ |
| 65 |
- confgcc="${confgcc} --enable-sjlj-exceptions" |
| 66 |
+ [[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && confgcc="${confgcc} --enable-sjlj-exceptions" |
| 67 |
+ [[ ${GCCMAJOR}.${GCCMINOR} > 3.3 ]] && confgcc="${confgcc} --enable-clocale=uclibc" |
| 68 |
elif [[ ${CTARGET} == *-gnu* ]] ; then |
| 69 |
confgcc="${confgcc} --enable-__cxa_atexit" |
| 70 |
+ confgcc="${confgcc} --enable-clocale=gnu" |
| 71 |
elif [[ ${CTARGET} == *-freebsd* ]]; then |
| 72 |
confgcc="${confgcc} --enable-__cxa_atexit" |
| 73 |
fi |
| 74 |
- [[ ${CTARGET} == *-gnu* ]] && confgcc="${confgcc} --enable-clocale=gnu" |
| 75 |
- [[ ${CTARGET} == *-uclibc* ]] && [[ ${GCCMAJOR}.${GCCMINOR} > 3.3 ]] \ |
| 76 |
- && confgcc="${confgcc} --enable-clocale=uclibc" |
| 77 |
+ [[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc="${confgcc} ---disable-libunwind-exceptions" |
| 78 |
|
| 79 |
tc_version_is_at_least 4.3 && set -- "$@" \ |
| 80 |
--with-bugurl=http://bugs.gentoo.org/ \ |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
-- |
| 85 |
gentoo-commits@l.g.o mailing list |
Archives