summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-03-30 14:14:34 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-30 14:14:34 +0100
commit9c7746453886b5dbf92cb3f289c455bec8ba1932 (patch)
tree7db0a50f3f7f00a27c8634f0cd5848e6d2ff0cc2 /meta
parentc75c0d68c2415591945ed8087ce052ae313dafdc (diff)
downloadopenembedded-core-9c7746453886b5dbf92cb3f289c455bec8ba1932.tar.gz
openembedded-core-9c7746453886b5dbf92cb3f289c455bec8ba1932.tar.bz2
openembedded-core-9c7746453886b5dbf92cb3f289c455bec8ba1932.tar.xz
openembedded-core-9c7746453886b5dbf92cb3f289c455bec8ba1932.zip
gcc-runtime: Handle libgcc headers correctly and set c++ include patch for packages correctly
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/gcc/gcc-package-cross.inc4
-rw-r--r--meta/packages/gcc/gcc-package-runtime.inc2
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 588427ef8..c3ea5f93c 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 646e58c58..055753b8e 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 \