| Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 1 | From abc3b82ab24169277f2090e9df1ceac3573142be Mon Sep 17 00:00:00 2001 |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 Mar 2013 09:22:00 +0400 |
| 4 | Subject: [PATCH] cpp: honor sysroot. |
| 5 | |
| 6 | Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile |
| 7 | preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location |
| 8 | rather than the --sysroot option specified on the commandline. If access to that directory is |
| 9 | permission denied (unreadable), gcc will error. |
| 10 | |
| 11 | This happens when ccache is in use due to the fact it uses preprocessed source files. |
| 12 | |
| 13 | The fix below adds %I to the cpp-output spec macro so the default substitutions for -iprefix, |
| 14 | -isystem, -isysroot happen and the correct sysroot is used. |
| 15 | |
| 16 | [YOCTO #2074] |
| 17 | |
| 18 | RP 2012/04/13 |
| 19 | |
| 20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 21 | |
| Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 22 | Upstream-Status: Pending |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 23 | --- |
| 24 | gcc/cp/lang-specs.h | 2 +- |
| Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 25 | gcc/gcc.cc | 2 +- |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 26 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 27 | |
| 28 | diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h |
| Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 29 | index f35c9fab76b..19ddc98ce7f 100644 |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 30 | --- a/gcc/cp/lang-specs.h |
| 31 | +++ b/gcc/cp/lang-specs.h |
| 32 | @@ -116,7 +116,7 @@ along with GCC; see the file COPYING3. If not see |
| 33 | {".ii", "@c++-cpp-output", 0, 0, 0}, |
| 34 | {"@c++-cpp-output", |
| 35 | "%{!E:%{!M:%{!MM:" |
| 36 | - " cc1plus -fpreprocessed %i %(cc1_options) %2" |
| 37 | + " cc1plus -fpreprocessed %i %I %(cc1_options) %2" |
| 38 | " %{!fsyntax-only:" |
| 39 | " %{fmodule-only:%{!S:-o %g.s%V}}" |
| 40 | " %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}" |
| Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 41 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc |
| 42 | index ce161d3c853..aa4cf92fb78 100644 |
| 43 | --- a/gcc/gcc.cc |
| 44 | +++ b/gcc/gcc.cc |
| 45 | @@ -1476,7 +1476,7 @@ static const struct compiler default_compilers[] = |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 46 | %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0}, |
| 47 | {".i", "@cpp-output", 0, 0, 0}, |
| 48 | {"@cpp-output", |
| 49 | - "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, |
| 50 | + "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %I %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, |
| 51 | {".s", "@assembler", 0, 0, 0}, |
| 52 | {"@assembler", |
| 53 | "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0}, |