summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2017-05-16 13:40:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 10:18:30 +0100
commit6e43be47d0eca11a8e6c03e517f57845cb2b80cc (patch)
tree14047f38caea03d6f0dc520c08168c35039ee2f4
parent1de1a34a64d2e34d438f6d24adbd70a62366dab7 (diff)
downloadpoky-6e43be47d0eca11a8e6c03e517f57845cb2b80cc.tar.gz
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>
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc4
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 ec1d281800..91a6fa6994 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} = "\
80 ${includedir}/c++/${BINV} \ 80 ${includedir}/c++/${BINV} \
81 ${prefix}/${TARGET_SYS}/bin/* \ 81 ${prefix}/${TARGET_SYS}/bin/* \
82 ${prefix}/${TARGET_SYS}/lib/* \ 82 ${prefix}/${TARGET_SYS}/lib/* \
83 ${prefix}/${TARGET_SYS}/usr/include/* \ 83 ${prefix}/${TARGET_SYS}${target_includedir}/* \
84" 84"
85INSANE_SKIP_${PN} += "dev-so" 85INSANE_SKIP_${PN} += "dev-so"
86 86
@@ -153,7 +153,7 @@ ELFUTILS = "nativesdk-elfutils"
153DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib" 153DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib"
154RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}" 154RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"
155 155
156SYSTEMHEADERS = "/usr/include" 156SYSTEMHEADERS = "${target_includedir}/"
157SYSTEMLIBS = "${target_base_libdir}/" 157SYSTEMLIBS = "${target_base_libdir}/"
158SYSTEMLIBS1 = "${target_libdir}/" 158SYSTEMLIBS1 = "${target_libdir}/"
159 159