[oe-commits] org.oe.dev binutils: workaround x86_64 problems, should close #2928

[cesarb commit]

binutils: workaround x86_64 problems, should close #2928

Author: cesarb at cesarb.net
Branch: org.openembedded.dev
Revision: 0b567b3945b5ad4f02eb6806ef0a0052ba2192d3
ViewMTN: http://monotone.openembedded.org/revision/info/0b567b3945b5ad4f02eb6806ef0a0052ba2192d3
Files:
1
packages/binutils/binutils-cross.inc
Diffs:

#
# mt diff -r81d2790a6eb5aa86ee8f3cf0f5be71f3dcb3ecde -r0b567b3945b5ad4f02eb6806ef0a0052ba2192d3
#
# 
# 
# patch "packages/binutils/binutils-cross.inc"
#  from [2a9f9e4a843e43fc6356fa81e25f167e69bdd8d2]
#    to [5220c374da49786833122769e3c53593a8202d99]
# 
============================================================
--- packages/binutils/binutils-cross.inc	2a9f9e4a843e43fc6356fa81e25f167e69bdd8d2
+++ packages/binutils/binutils-cross.inc	5220c374da49786833122769e3c53593a8202d99
@@ -18,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
+	mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib || \
+		mv -f ${CROSS_DIR}/lib64/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib
 	rmdir ${CROSS_DIR}/lib || :
+	rmdir ${CROSS_DIR}/lib64 || :
 }
 
 do_install () {