mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
45987c5135
Override cxx-sysincludes along with CC and CXX since it contains path pointing to tcbootstrap sysroot which does not have c++ headers and libraries Drop shorten-build-commands patch since it did not override the include flags for c++ headers when tests written in c++ are executed the @includes file does not get updated to add c++ header paths This patch only reduced the build output anyway Add a patch to point eglibc to look into c++ headers the way OE installs them its not standard install e.g. usr/include/c++/GCC_VER but instead usr/include/c++. This lets g++ find the headers in right place when compiling c++ testcases (From OE-Core rev: dc1fbfb2cd3c0d35f212523189ea7b1621906201) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
build system of glibc currently adds the cxx headers path by detecting
|
|
it using provided CXX and expects that they are installed w.r.t to standard
|
|
installation location but in OE we install and use cxx headers from target
|
|
sysroot therefore that code needs to be adapted for OE
|
|
|
|
Upstream-Status: Inappropriate [OE-specific]
|
|
|
|
-Khem
|
|
|
|
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -1118,9 +1118,8 @@ if test -n "$sysheaders"; then
|
|
SYSINCLUDES="$SYSINCLUDES \
|
|
-isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
|
|
if test -n "$CXX"; then
|
|
- cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
|
|
cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` &&
|
|
- cxxheaders=`$CXX -print-file-name=../../../../include/c++/`"$cxxversion" &&
|
|
+ cxxheaders=`$CXX -print-sysroot`"$prefix/include/c++" &&
|
|
CXX_SYSINCLUDES="-isystem $cxxheaders \
|
|
-isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
|
|
fi
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -5544,9 +5544,8 @@ if test -n "$sysheaders"; then
|
|
SYSINCLUDES="$SYSINCLUDES \
|
|
-isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
|
|
if test -n "$CXX"; then
|
|
- cxxversion=`$CXX -dumpversion 2>&5` &&
|
|
cxxmachine=`$CXX -dumpmachine 2>&5` &&
|
|
- cxxheaders=`$CXX -print-file-name=../../../../include/c++/`"$cxxversion" &&
|
|
+ cxxheaders=`$CXX -print-sysroot`"$prefix/include/c++" &&
|
|
CXX_SYSINCLUDES="-isystem $cxxheaders \
|
|
-isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
|
|
fi
|