From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 23 Apr 2004 18:35:14 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~19590
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51e2e04bfd2e374da31fc14bd134ac205de20fe5;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/usr/local/projects/packages

2004/04/23 20:35:07+02:00 uni-frankfurt.de!mickeyl
avoid problems when include/c++ symlink already exists in staging - patch courtesy pb_.

BKrev: 408961e2KIDwQzmJXnI2GVFEjatLrA
---

diff --git a/gcc/gcc-cross_3.3.3.oe b/gcc/gcc-cross_3.3.3.oe
index 0a7679b933..1bbed5328c 100644
--- a/gcc/gcc-cross_3.3.3.oe
+++ b/gcc/gcc-cross_3.3.3.oe
@@ -58,6 +58,7 @@ do_stage_append () {
 	# Fix a few include links so cross builds are happier
 	if [ ! -e ${STAGING_INCDIR}/c++ ]; then
 		mkdir -p ${STAGING_INCDIR}
+		rm -f ${STAGING_INCDIR}/c++
 		ln -s ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
 			${STAGING_INCDIR}/
 	fi