From 2d378dea316d1d701db9d1e3df2757ddfd8c0ae7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 1 Oct 2008 13:12:01 +0000
Subject: gcc: sync with poky

---
 packages/gcc/gcc-common.inc         | 2 +-
 packages/gcc/gcc-package-sdk.inc    | 1 +
 packages/gcc/gcc-package-target.inc | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'packages/gcc')

diff --git a/packages/gcc/gcc-common.inc b/packages/gcc/gcc-common.inc
index 1097614969..73bc327507 100644
--- a/packages/gcc/gcc-common.inc
+++ b/packages/gcc/gcc-common.inc
@@ -14,7 +14,7 @@ def get_gcc_fpu_setting(bb, d):
 
 # We really need HOST_SYS here for some packages and TARGET_SYS for others.
 # For now, libgcc is most important so we fix for that - RP.
-SHLIBSDIR = "${STAGING_DIR}/${TARGET_SYS}/shlibs"
+SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs"
 
 DEBIANNAME_libgcc = "libgcc1"
 
diff --git a/packages/gcc/gcc-package-sdk.inc b/packages/gcc/gcc-package-sdk.inc
index a36e632c9f..41f47aec1d 100644
--- a/packages/gcc/gcc-package-sdk.inc
+++ b/packages/gcc/gcc-package-sdk.inc
@@ -20,6 +20,7 @@ FILES_${PN} = "\
     ${includedir}/c++/${BINV} \
     ${prefix}/${TARGET_SYS}/bin/* \
     ${prefix}/${TARGET_SYS}/lib/* \
+    ${prefix}/${TARGET_SYS}/usr/include/* \
     "
 FILES_${PN}-doc = "\
     ${infodir} \
diff --git a/packages/gcc/gcc-package-target.inc b/packages/gcc/gcc-package-target.inc
index 9076c013e1..68c84abd5a 100644
--- a/packages/gcc/gcc-package-target.inc
+++ b/packages/gcc/gcc-package-target.inc
@@ -154,4 +154,7 @@ do_install () {
 	ln -sf gcc cc
 	ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp
 	ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp
+
+	# Remove precompiled c++ headers as they are really big
+	rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_SYS}/bits/*.gch
 }
-- 
cgit v1.2.3