diff options
author | Richard Tollerton <rich.tollerton@ni.com> | 2014-07-03 17:00:26 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-10 17:38:33 +0100 |
commit | 90362a4de5cbed6815fb84be950030ebde5bc3fe (patch) | |
tree | 9ae8280991f6e2b3bb9682ba1def866cd146217a /meta/recipes-devtools/gcc/gcc-cross.inc | |
parent | 76940edcdfe7fc40b7b7c2ef67fdcc5329f69463 (diff) | |
download | poky-90362a4de5cbed6815fb84be950030ebde5bc3fe.tar.gz |
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 <ken.sharp@ni.com>
Acked-by: Ben Shelton <ben.shelton@ni.com>
(From OE-Core rev: 5a2ff3e8f7cd7a47a5ab4e581847ecc4df87fca3)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-cross.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ | |||
21 | --with-system-zlib " | 21 | --with-system-zlib " |
22 | 22 | ||
23 | EXTRA_OECONF_PATHS = " \ | 23 | EXTRA_OECONF_PATHS = " \ |
24 | --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ | 24 | --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ |
25 | --with-sysroot=${STAGING_DIR_TARGET} \ | 25 | --with-sysroot=${STAGING_DIR_TARGET} \ |
26 | --with-build-sysroot=${STAGING_DIR_TARGET}" | 26 | --with-build-sysroot=${STAGING_DIR_TARGET}" |
27 | 27 | ||