From 08e51e1ce6fe9065ddc6c31d2a4c289609efe6c3 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 19 Mar 2008 23:27:49 +0000
Subject: bintuils-cross.inc: Merge improvements from OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4093 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/binutils/binutils-cross.inc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'meta/packages')

diff --git a/meta/packages/binutils/binutils-cross.inc b/meta/packages/binutils/binutils-cross.inc
index a45a39fea..63e5cf6a6 100644
--- a/meta/packages/binutils/binutils-cross.inc
+++ b/meta/packages/binutils/binutils-cross.inc
@@ -4,7 +4,9 @@ DEPENDS += "flex-native bison-native"
 PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 PACKAGES = ""
 EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
-		--program-prefix=${TARGET_PREFIX}"
+		--program-prefix=${TARGET_PREFIX} \
+		--enable-install-libbfd \
+                --disable-werror"
 
 do_stage () {
 	oe_runmake install
@@ -16,13 +18,17 @@ do_stage () {
 	rm -rf ${CROSS_DIR}/share/man
 	rmdir ${CROSS_DIR}/share || :
 	rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
+	rmdir ${CROSS_DIR}/${libdir}64/gcc-lib || :
 	rmdir ${CROSS_DIR}/${libdir} || :
+	rmdir ${CROSS_DIR}/${libdir}64 || :
 	rmdir ${CROSS_DIR}/${prefix} || :
 
 	# We want to move this into the target specific location
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
-	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
+	mkdir -p ${STAGING_DIR_TARGET}/lib
+	mv -f ${CROSS_DIR}/lib/libiberty.a ${STAGING_DIR_TARGET}/lib/lib || \
+		mv -f ${CROSS_DIR}/lib64/libiberty.a ${STAGING_DIR_TARGET}/lib/lib
 	rmdir ${CROSS_DIR}/lib || :
+	rmdir ${CROSS_DIR}/lib64 || :
 }
 
 do_install () {
-- 
cgit v1.2.3