gcc-runtime: Handle libgcc headers correctly and set c++ include patch for packages correctly

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc
index 588427ef85..c3ea5f93c4 100644
--- a/meta/packages/gcc/gcc-package-cross.inc
+++ b/meta/packages/gcc/gcc-package-cross.inc
@@ -17,9 +17,9 @@ do_install () {
         done
 
         # gcc-runtime requires some headers, we stash them here
-        if [ "${PN}" == "gcc-cross" ]; then
+        if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then
                 install -d ${D}${includedir}/gcc-build-internal
-                for f in auto-host.h gcov-iov.h gthr-default.h libgcc.mvars options.h tconfig.h tm.h; do
+                for f in *.h *.c libgcc.mvars; do
                         cp ${B}/gcc/$f ${D}${includedir}/gcc-build-internal/
                 done
         fi
diff --git a/meta/packages/gcc/gcc-package-runtime.inc b/meta/packages/gcc/gcc-package-runtime.inc
index 646e58c589..055753b8ea 100644
--- a/meta/packages/gcc/gcc-package-runtime.inc
+++ b/meta/packages/gcc/gcc-package-runtime.inc
@@ -28,7 +28,7 @@ FILES_libg2c-dev = "\
 
 FILES_libstdc++ = "${libdir}/libstdc++.so.*"
 FILES_libstdc++-dev = "\
-  ${includedir}/c++/${BINV} \
+  ${includedir}/c++/ \
   ${libdir}/libstdc++.so \
   ${libdir}/libstdc++.la \
   ${libdir}/libstdc++.a \