summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-08-16 10:33:00 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-22 22:48:26 +0100
commit0f0c56c40c801df8cc21d946b82a1a90b8d617b4 (patch)
tree5a9d3e8c241a39affe5e395ef00f920f84db220d /meta
parent0d5c966c30560086f91f2573849a3a01ef182d72 (diff)
downloadpoky-0f0c56c40c801df8cc21d946b82a1a90b8d617b4.tar.gz
gcc: Search in OE specific target gcclibdir
We put gcclibir to be /usr/lib/<arch>/... and not default usr/lib/gcc/<arch>, therefore make the include search path also look into this directory, this should help in finding gcc headers like omp.h (From OE-Core rev: 121ce09332099ab7ea695a3495daf4f904f69ae5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-8.3/0021-Ensure-target-gcc-headers-can-be-included.patch8
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch6
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-8.3/0021-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-8.3/0021-Ensure-target-gcc-headers-can-be-included.patch
index 60d72699d6..58b4d1aa68 100644
--- a/meta/recipes-devtools/gcc/gcc-8.3/0021-Ensure-target-gcc-headers-can-be-included.patch
+++ b/meta/recipes-devtools/gcc/gcc-8.3/0021-Ensure-target-gcc-headers-can-be-included.patch
@@ -1,4 +1,4 @@
1From 476eda9054df443d094273c8b61fce63d940adfc Mon Sep 17 00:00:00 2001 1From 94cc995cee76a9d59204a900fcaa2afb2eaa75c2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 10:25:11 +0000 3Date: Fri, 20 Feb 2015 10:25:11 +0000
4Subject: [PATCH 21/40] Ensure target gcc headers can be included 4Subject: [PATCH 21/40] Ensure target gcc headers can be included
@@ -23,14 +23,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 4 files changed, 15 insertions(+), 7 deletions(-) 23 4 files changed, 15 insertions(+), 7 deletions(-)
24 24
25diff --git a/gcc/Makefile.in b/gcc/Makefile.in 25diff --git a/gcc/Makefile.in b/gcc/Makefile.in
26index 71a8275c39f..5ae693fb06c 100644 26index 71a8275c39f..aa4adc3db24 100644
27--- a/gcc/Makefile.in 27--- a/gcc/Makefile.in
28+++ b/gcc/Makefile.in 28+++ b/gcc/Makefile.in
29@@ -614,6 +614,7 @@ libexecdir = @libexecdir@ 29@@ -614,6 +614,7 @@ libexecdir = @libexecdir@
30 30
31 # Directory in which the compiler finds libraries etc. 31 # Directory in which the compiler finds libraries etc.
32 libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) 32 libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
33+libsubdir_target = gcc/$(target_noncanonical)/$(version) 33+libsubdir_target = $(target_noncanonical)/$(version)
34 # Directory in which the compiler finds executables 34 # Directory in which the compiler finds executables
35 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) 35 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
36 # Directory in which all plugin resources are installed 36 # Directory in which all plugin resources are installed
@@ -94,5 +94,5 @@ index 570cdc00034..3fb64d453f1 100644
94 #undef MD_EXEC_PREFIX 94 #undef MD_EXEC_PREFIX
95 #undef MD_STARTFILE_PREFIX 95 #undef MD_STARTFILE_PREFIX
96-- 96--
972.21.0 972.22.1
98 98
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch
index 4809bdf4bd..af0ea5c60a 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch
@@ -1,4 +1,4 @@
1From 5225980db3e03b2fe6597393d7177d0cafd1b1d9 Mon Sep 17 00:00:00 2001 1From d27ba49e2e5c608c43265462d6831363cc7f565b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 10:25:11 +0000 3Date: Fri, 20 Feb 2015 10:25:11 +0000
4Subject: [PATCH 19/36] Ensure target gcc headers can be included 4Subject: [PATCH 19/36] Ensure target gcc headers can be included
@@ -23,14 +23,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 4 files changed, 15 insertions(+), 7 deletions(-) 23 4 files changed, 15 insertions(+), 7 deletions(-)
24 24
25diff --git a/gcc/Makefile.in b/gcc/Makefile.in 25diff --git a/gcc/Makefile.in b/gcc/Makefile.in
26index 0064a282488..21472745c2c 100644 26index 0064a282488..98d1488171f 100644
27--- a/gcc/Makefile.in 27--- a/gcc/Makefile.in
28+++ b/gcc/Makefile.in 28+++ b/gcc/Makefile.in
29@@ -618,6 +618,7 @@ libexecdir = @libexecdir@ 29@@ -618,6 +618,7 @@ libexecdir = @libexecdir@
30 30
31 # Directory in which the compiler finds libraries etc. 31 # Directory in which the compiler finds libraries etc.
32 libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) 32 libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
33+libsubdir_target = gcc/$(target_noncanonical)/$(version) 33+libsubdir_target = $(target_noncanonical)/$(version)
34 # Directory in which the compiler finds executables 34 # Directory in which the compiler finds executables
35 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) 35 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
36 # Directory in which all plugin resources are installed 36 # Directory in which all plugin resources are installed