| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From e99c9c97266d6d3e8cac798aa91408250c4d60cf Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 Mar 2013 09:00:34 +0400 |
| 4 | Subject: [PATCH 17/35] gcc-poison-dir-extend |
| 5 | |
| 6 | Add /sw/include and /opt/include based on the original |
| 7 | zecke-no-host-includes.patch patch. The original patch checked for |
| 8 | /usr/include, /sw/include and /opt/include and then triggered a failure and |
| 9 | aborted. |
| 10 | |
| 11 | Instead, we add the two missing items to the current scan. If the user |
| 12 | wants this to be a failure, they can add "-Werror=poison-system-directories". |
| 13 | |
| 14 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 16 | |
| 17 | Upstream-Status: Pending |
| 18 | --- |
| 19 | gcc/incpath.c | 4 +++- |
| 20 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 21 | |
| 22 | diff --git a/gcc/incpath.c b/gcc/incpath.c |
| 23 | index cd41c78..eac4a92 100644 |
| 24 | --- a/gcc/incpath.c |
| 25 | +++ b/gcc/incpath.c |
| 26 | @@ -393,7 +393,9 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) |
| 27 | { |
| 28 | if ((!strncmp (p->name, "/usr/include", 12)) |
| 29 | || (!strncmp (p->name, "/usr/local/include", 18)) |
| 30 | - || (!strncmp (p->name, "/usr/X11R6/include", 18))) |
| 31 | + || (!strncmp (p->name, "/usr/X11R6/include", 18)) |
| 32 | + || (!strncmp (p->name, "/sw/include", 11)) |
| 33 | + || (!strncmp (p->name, "/opt/include", 12))) |
| 34 | warning (OPT_Wpoison_system_directories, |
| 35 | "include location \"%s\" is unsafe for " |
| 36 | "cross-compilation", |
| 37 | -- |
| 38 | 1.7.10.4 |
| 39 | |