| 1 |
grobian 09/04/04 16:52:40 |
| 2 |
|
| 3 |
Modified: toolchain.eclass |
| 4 |
Log: |
| 5 |
backport some fixes for Darwin and Solaris from Prefix |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.396 eclass/toolchain.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.396&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.396&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.395&r2=1.396 |
| 13 |
|
| 14 |
Index: toolchain.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
| 17 |
retrieving revision 1.395 |
| 18 |
retrieving revision 1.396 |
| 19 |
diff -u -r1.395 -r1.396 |
| 20 |
--- toolchain.eclass 15 Mar 2009 07:13:25 -0000 1.395 |
| 21 |
+++ toolchain.eclass 4 Apr 2009 16:52:40 -0000 1.396 |
| 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.395 2009/03/15 07:13:25 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.396 2009/04/04 16:52:40 grobian Exp $ |
| 27 |
# |
| 28 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 29 |
|
| 30 |
@@ -1285,6 +1285,12 @@ |
| 31 |
--mandir=${DATAPATH}/man \ |
| 32 |
--infodir=${DATAPATH}/info \ |
| 33 |
--with-gxx-include-dir=${STDCXX_INCDIR}" |
| 34 |
+ # On Darwin we need libdir to be set in order to get correct install names |
| 35 |
+ # for things like libobjc-gnu, libgcj and libfortran. If we enable it on |
| 36 |
+ # non-Darwin we screw up the behaviour this eclass relies on. We in |
| 37 |
+ # particular need this over --libdir for bug #255315. |
| 38 |
+ [[ ${CHOST} == *-darwin* ]] && \ |
| 39 |
+ confgcc="${confgcc} --enable-version-specific-runtime-libs" |
| 40 |
|
| 41 |
# All our cross-compile logic goes here ! woo ! |
| 42 |
confgcc="${confgcc} --host=${CHOST}" |
| 43 |
@@ -1379,6 +1385,8 @@ |
| 44 |
confgcc="${confgcc} --enable-clocale=gnu" |
| 45 |
elif [[ ${CTARGET} == *-freebsd* ]]; then |
| 46 |
confgcc="${confgcc} --enable-__cxa_atexit" |
| 47 |
+ elif [[ ${CTARGET} == *-solaris* ]]; then |
| 48 |
+ confgcc="${confgcc} --enable-__cxa_atexit" |
| 49 |
fi |
| 50 |
[[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc="${confgcc} --disable-libunwind-exceptions" |
| 51 |
|
| 52 |
@@ -1580,6 +1588,11 @@ |
| 53 |
3.4|4.*) |
| 54 |
case $(tc-arch) in |
| 55 |
x86|amd64) filter-flags '-mcpu=*';; |
| 56 |
+ *-macos) |
| 57 |
+ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25127 |
| 58 |
+ [[ ${GCC_BRANCH_VER} == 4.0 || ${GCC_BRANCH_VER} == 4.1 ]] && \ |
| 59 |
+ filter-flags '-mcpu=*' '-march=*' '-mtune=*' |
| 60 |
+ ;; |
| 61 |
esac |
| 62 |
;; |
| 63 |
esac |
| 64 |
@@ -2487,6 +2500,8 @@ |
| 65 |
case ${CTARGET} in |
| 66 |
mips64*|powerpc64*|s390x*|sparc*|x86_64*) |
| 67 |
has_multilib_profile || use multilib ;; |
| 68 |
+ *-*-solaris*) use multilib ;; |
| 69 |
+ *-apple-darwin*) use multilib ;; |
| 70 |
*) false ;; |
| 71 |
esac |
| 72 |
} |
Archives