[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6314/8267] gcc-cross-canadian: Use ${target_includedir} for compatibility with meta-micro

[Emmanuele Bassi <ebassi src gnome org>]

commit 6e43be47d0eca11a8e6c03e517f57845cb2b80cc
Author: Mike Crowe <mac mcrowe com>
Date:   Tue May 16 13:40:00 2017 +0100

    gcc-cross-canadian: Use ${target_includedir} for compatibility with meta-micro
    
    meta-micro puts headers in /include rather than /usr/include in the
    sysroot. ${target_includedir} means that the correct path will be used
    automatically.
    
    (From OE-Core rev: 12abcc3791592035d99064262eb3d229fa5ef88c)
    
    Signed-off-by: Mike Crowe <mac mcrowe com>
    Acked-by: Phil Blundell <pb pbcl net>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/gcc/gcc-cross-canadian.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc 
b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index ec1d281..91a6fa6 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -80,7 +80,7 @@ FILES_${PN} = "\
     ${includedir}/c++/${BINV} \
     ${prefix}/${TARGET_SYS}/bin/* \
     ${prefix}/${TARGET_SYS}/lib/* \
-    ${prefix}/${TARGET_SYS}/usr/include/* \
+    ${prefix}/${TARGET_SYS}${target_includedir}/* \
 "
 INSANE_SKIP_${PN} += "dev-so"
 
@@ -153,7 +153,7 @@ ELFUTILS = "nativesdk-elfutils"
 DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib"
 RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"
 
-SYSTEMHEADERS = "/usr/include"
+SYSTEMHEADERS = "${target_includedir}/"
 SYSTEMLIBS = "${target_base_libdir}/"
 SYSTEMLIBS1 = "${target_libdir}/"