diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-5.4/0038-fix-g-sysroot.patch')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-5.4/0038-fix-g-sysroot.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-5.4/0038-fix-g-sysroot.patch b/meta/recipes-devtools/gcc/gcc-5.4/0038-fix-g-sysroot.patch deleted file mode 100644 index 9ba574a5c6..0000000000 --- a/meta/recipes-devtools/gcc/gcc-5.4/0038-fix-g-sysroot.patch +++ /dev/null | |||
| @@ -1,56 +0,0 @@ | |||
| 1 | From 8df3e7007a22c9d6be5d5ae4b9b169c5c8431917 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 27 May 2015 17:06:06 -0700 | ||
| 4 | Subject: [PATCH 38/46] fix g++ sysroot | ||
| 5 | |||
| 6 | Portions of | ||
| 7 | |||
| 8 | http://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg26013.html | ||
| 9 | |||
| 10 | are not upstreamed yet. So lets keep missing pieces. | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | |||
| 14 | Without this, compiling something simple like #include <limits> on target | ||
| 15 | with c++ test.cpp fails unable to find the header. strace shows it looking in | ||
| 16 | usr/include/xxxx rather than /usr/include/xxxx | ||
| 17 | |||
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 19 | --- | ||
| 20 | gcc/configure | 4 +++- | ||
| 21 | gcc/configure.ac | 4 +++- | ||
| 22 | 2 files changed, 6 insertions(+), 2 deletions(-) | ||
| 23 | |||
| 24 | diff --git a/gcc/configure b/gcc/configure | ||
| 25 | index 9b60aad..6df594c 100755 | ||
| 26 | --- a/gcc/configure | ||
| 27 | +++ b/gcc/configure | ||
| 28 | @@ -3375,7 +3375,9 @@ gcc_gxx_include_dir_add_sysroot=0 | ||
| 29 | if test "${with_sysroot+set}" = set; then | ||
| 30 | gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` | ||
| 31 | if test "${gcc_gxx_without_sysroot}"; then | ||
| 32 | - gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
| 33 | + if test x${with_sysroot} != x/; then | ||
| 34 | + gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
| 35 | + fi | ||
| 36 | gcc_gxx_include_dir_add_sysroot=1 | ||
| 37 | fi | ||
| 38 | fi | ||
| 39 | diff --git a/gcc/configure.ac b/gcc/configure.ac | ||
| 40 | index e1e54f2..3bb2173 100644 | ||
| 41 | --- a/gcc/configure.ac | ||
| 42 | +++ b/gcc/configure.ac | ||
| 43 | @@ -152,7 +152,9 @@ gcc_gxx_include_dir_add_sysroot=0 | ||
| 44 | if test "${with_sysroot+set}" = set; then | ||
| 45 | gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` | ||
| 46 | if test "${gcc_gxx_without_sysroot}"; then | ||
| 47 | - gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
| 48 | + if test x${with_sysroot} != x/; then | ||
| 49 | + gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" | ||
| 50 | + fi | ||
| 51 | gcc_gxx_include_dir_add_sysroot=1 | ||
| 52 | fi | ||
| 53 | fi | ||
| 54 | -- | ||
| 55 | 2.6.3 | ||
| 56 | |||
