From 5a2ff3e8f7cd7a47a5ab4e581847ecc4df87fca3 Mon Sep 17 00:00:00 2001 From: Richard Tollerton Date: Thu, 3 Jul 2014 17:00:26 -0500 Subject: gcc: Ensure c++ includes are in /usr/include/c++/${BINV} It was observed that code using STLport 4.6 fails to compile under the SDK with the following error message: .../includes/cstddef:38:46: fatal error: ../4.7.2/cstddef: No such file or directory STLport 4.6 (screwily) assumes that the C++ system headers live in a gcc-versioned subdirectory, for gcc>=3.0; cf http://sourceforge.net/p/stlport/code/ci/STLport-4.6-patch/tree/stlport/config/stl_gcc.h#l269. This assumption is *almost always* valid, because that matches the default setting of --with-gxx-include-dir. We can match that behavior by appending "/${BINV}" to our own --with-gxx-include-dir settings. Natinst-CAR-ID: 446449 Natinst-Reviewboard-ID: 57209 Acked-by: Ken Sharp Acked-by: Ben Shelton Signed-off-by: Richard Tollerton Signed-off-by: Saul Wold --- meta/recipes-devtools/gcc/gcc-cross.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-devtools/gcc/gcc-cross.inc') diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 0bf29e34d3..cf3e5e891d 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -21,7 +21,7 @@ EXTRA_OECONF += "--disable-libunwind-exceptions \ --with-system-zlib " EXTRA_OECONF_PATHS = " \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET}" -- cgit 1.2.3-korg