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.

Signed-off-by Mike Crowe <[email protected]>

Acked-by Phil Blundell <[email protected]>

---
 meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

meta/recipes-devtools/gcc/gcc-cross-canadian.inc +2 -2

index ec1d281800..91a6fa6994 100644
@@ -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}/"
 

Signature · 1 line

2.11.0

Quoted 4 lines · Mike Crowe

meta-micro puts headers in /include rather than /usr/include in the sysroot. ${target_includedir} means that the correct path will be used automatically.

Quoted 29 lines

Signed-off-by Mike Crowe <[email protected]>

Acked-by Phil Blundell <[email protected]>

---
 meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

meta/recipes-devtools/gcc/gcc-cross-canadian.inc +2 -3

index ec1d281800..91a6fa6994 100644
@@ -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}/"
 
--

Quoted 1 line

2.11.0

This patch ended up in https://patchwork.openembedded.org/patch/139908/ . There don't appear to have been any objections. Is there any chance it could go in?

Thanks.

Mike.
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core