summaryrefslogtreecommitdiffstats
path: root/meta/packages/gcc
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-12-28 23:22:59 +0000
committerRichard Purdie <richard@openedhand.com>2006-12-28 23:22:59 +0000
commitc378b7f5e21b85f3f031f52221587d2d51d94c36 (patch)
tree076d8d7d68f385c121ef94ec70b338433add1266 /meta/packages/gcc
parent61e233a86900418238e350968c4b9e851cdb52a9 (diff)
downloadpoky-c378b7f5e21b85f3f031f52221587d2d51d94c36.tar.gz
gcc-build3.inc: Merge from OE.dev to fix EABI build failures (esp. qemux86)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1104 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gcc')
-rw-r--r--meta/packages/gcc/gcc3-build.inc20
1 files changed, 13 insertions, 7 deletions
diff --git a/meta/packages/gcc/gcc3-build.inc b/meta/packages/gcc/gcc3-build.inc
index fbf40af6e4..2924f0f9dd 100644
--- a/meta/packages/gcc/gcc3-build.inc
+++ b/meta/packages/gcc/gcc3-build.inc
@@ -11,14 +11,14 @@ B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
11BINV ?= "${PV}" 11BINV ?= "${PV}"
12 12
13# gcj doesn't work on some architectures 13# gcj doesn't work on some architectures
14JAVA = ",java" 14JAVA ?= ",java"
15JAVA_arm = "" 15JAVA_arm ?= ""
16JAVA_armeb = "" 16JAVA_armeb ?= ""
17JAVA_mipsel = "" 17JAVA_mipsel ?= ""
18JAVA_sh3 = "" 18JAVA_sh3 ?= ""
19# gcc4-build sets this to f95 19# gcc4-build sets this to f95
20FORTRAN ?= "f77" 20FORTRAN ?= ",f77"
21LANGUAGES ?= "c,c++,${FORTRAN}${JAVA}" 21LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
22 22
23EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ 23EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
24 --with-gnu-ld \ 24 --with-gnu-ld \
@@ -60,8 +60,13 @@ python __anonymous () {
60 import bb, re 60 import bb, re
61 if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None): 61 if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
62 bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d) 62 bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
63 elif (re.match('linux-uclibcgnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
64 bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
65 elif (re.match('linux-gnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
66 bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
63 elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None): 67 elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
64 bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d) 68 bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
69
65} 70}
66 71
67do_configure () { 72do_configure () {
@@ -78,6 +83,7 @@ do_configure () {
78 export LD_FOR_TARGET="${HOST_PREFIX}ld" 83 export LD_FOR_TARGET="${HOST_PREFIX}ld"
79 export NM_FOR_TARGET="${HOST_PREFIX}nm" 84 export NM_FOR_TARGET="${HOST_PREFIX}nm"
80 export AR_FOR_TARGET="${HOST_PREFIX}ar" 85 export AR_FOR_TARGET="${HOST_PREFIX}ar"
86 export GFORTRAN_FOR_TARGET="gfortran"
81 export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib" 87 export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
82 fi 88 fi
83 export CC_FOR_BUILD="${BUILD_CC}" 89 export CC_FOR_BUILD="${BUILD_CC}"