Merge branch 'master' into deploy

* master:
  Makefile: Include C++ headers in the cross-tools bundle.

diff --git a/Makefile b/Makefile
index 79495a4bea0d76b8b195d13772ed301d630bdf0a..4b4a6161173e6855488628d358a8e914b46e7668 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,8 @@ CROSS_PATHS         += \
                $(addprefix /usr/bin/$a-, \
                        cpp gcc g++ gcov gcov-dump gcov-tool gprof \
                        gcc-ar gcc-nm gcc-ranlib) \
-               /usr/lib/gcc-cross/$a/)
+               /usr/lib/gcc-cross/$a/ \
+               /usr/$a/include/c++)
 
 ## Local packages to be compiled and installed in chroots.  Archives can be
 ## found in `pkg/'.