summaryrefslogtreecommitdiffstats
path: root/meta
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
parent61e233a86900418238e350968c4b9e851cdb52a9 (diff)
downloadpoky-c378b7f5e21b85f3f031f52221587d2d51d94c36.tar.gz
poky-c378b7f5e21b85f3f031f52221587d2d51d94c36.tar.bz2
poky-c378b7f5e21b85f3f031f52221587d2d51d94c36.zip
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')
-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}"
BINV ?= "${PV}"
# gcj doesn't work on some architectures
-JAVA = ",java"
-JAVA_arm = ""
-JAVA_armeb = ""
-JAVA_mipsel = ""
-JAVA_sh3 = ""
+JAVA ?= ",java"
+JAVA_arm ?= ""
+JAVA_armeb ?= ""
+JAVA_mipsel ?= ""
+JAVA_sh3 ?= ""
# gcc4-build sets this to f95
-FORTRAN ?= "f77"
-LANGUAGES ?= "c,c++,${FORTRAN}${JAVA}"
+FORTRAN ?= ",f77"
+LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
--with-gnu-ld \
@@ -60,8 +60,13 @@ python __anonymous () {
import bb, re
if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+ elif (re.match('linux-uclibcgnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+ bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+ elif (re.match('linux-gnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+ bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
+
}
do_configure () {
@@ -78,6 +83,7 @@ do_configure () {
export LD_FOR_TARGET="${HOST_PREFIX}ld"
export NM_FOR_TARGET="${HOST_PREFIX}nm"
export AR_FOR_TARGET="${HOST_PREFIX}ar"
+ export GFORTRAN_FOR_TARGET="gfortran"
export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
fi
export CC_FOR_BUILD="${BUILD_CC}"