Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame] | 1 | From a6c90d3a9c5010b4aa7cc30467cf81ca7e0f430e Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 Mar 2013 09:16:28 +0400 |
Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame] | 4 | Subject: [PATCH] COLLECT_GCC_OPTIONS |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 5 | |
| 6 | This patch adds --sysroot into COLLECT_GCC_OPTIONS which is used to |
| 7 | invoke collect2. |
| 8 | |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | --- |
| 13 | gcc/gcc.c | 9 +++++++++ |
| 14 | 1 file changed, 9 insertions(+) |
| 15 | |
| 16 | diff --git a/gcc/gcc.c b/gcc/gcc.c |
Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame] | 17 | index f8be58ce0a6..48b0f9dde81 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 18 | --- a/gcc/gcc.c |
| 19 | +++ b/gcc/gcc.c |
Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame] | 20 | @@ -4806,6 +4806,15 @@ set_collect_gcc_options (void) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 21 | sizeof ("COLLECT_GCC_OPTIONS=") - 1); |
| 22 | |
| 23 | first_time = TRUE; |
| 24 | +#ifdef HAVE_LD_SYSROOT |
| 25 | + if (target_system_root_changed && target_system_root) |
| 26 | + { |
| 27 | + obstack_grow (&collect_obstack, "'--sysroot=", sizeof("'--sysroot=")-1); |
| 28 | + obstack_grow (&collect_obstack, target_system_root,strlen(target_system_root)); |
| 29 | + obstack_grow (&collect_obstack, "'", 1); |
| 30 | + first_time = FALSE; |
| 31 | + } |
| 32 | +#endif |
| 33 | for (i = 0; (int) i < n_switches; i++) |
| 34 | { |
| 35 | const char *const *args; |