55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
|
From 98d9c0c1b5552294b2130f7304bfb522da323442 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Khem Raj <raj.khem@gmail.com>
|
||
|
|
Date: Fri, 29 Mar 2013 09:22:00 +0400
|
||
|
|
Subject: [PATCH 19/46] cpp: honor sysroot.
|
||
|
|
|
||
|
|
Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile
|
||
|
|
preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location
|
||
|
|
rather than the --sysroot option specified on the commandline. If access to that directory is
|
||
|
|
permission denied (unreadable), gcc will error.
|
||
|
|
|
||
|
|
This happens when ccache is in use due to the fact it uses preprocessed source files.
|
||
|
|
|
||
|
|
The fix below adds %I to the cpp-output spec macro so the default substitutions for -iprefix,
|
||
|
|
-isystem, -isysroot happen and the correct sysroot is used.
|
||
|
|
|
||
|
|
[YOCTO #2074]
|
||
|
|
|
||
|
|
RP 2012/04/13
|
||
|
|
|
||
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||
|
|
|
||
|
|
Upstream-Status: Pending
|
||
|
|
---
|
||
|
|
gcc/cp/lang-specs.h | 2 +-
|
||
|
|
gcc/gcc.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
|
||
|
|
index 9707fac..fe487a2 100644
|
||
|
|
--- a/gcc/cp/lang-specs.h
|
||
|
|
+++ b/gcc/cp/lang-specs.h
|
||
|
|
@@ -64,5 +64,5 @@ along with GCC; see the file COPYING3. If not see
|
||
|
|
{".ii", "@c++-cpp-output", 0, 0, 0},
|
||
|
|
{"@c++-cpp-output",
|
||
|
|
"%{!M:%{!MM:%{!E:\
|
||
|
|
- cc1plus -fpreprocessed %i %(cc1_options) %2\
|
||
|
|
+ cc1plus -fpreprocessed %i %I %(cc1_options) %2\
|
||
|
|
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
|
||
|
|
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
||
|
|
index 7ca129f..04fa81d 100644
|
||
|
|
--- a/gcc/gcc.c
|
||
|
|
+++ b/gcc/gcc.c
|
||
|
|
@@ -1329,7 +1329,7 @@ static const struct compiler default_compilers[] =
|
||
|
|
%W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0},
|
||
|
|
{".i", "@cpp-output", 0, 0, 0},
|
||
|
|
{"@cpp-output",
|
||
|
|
- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
|
||
|
|
+ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %I %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
|
||
|
|
{".s", "@assembler", 0, 0, 0},
|
||
|
|
{"@assembler",
|
||
|
|
"%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
|
||
|
|
--
|
||
|
|
2.8.2
|
||
|
|
|