forked from brl/citadel
39 lines
1.0 KiB
Diff
39 lines
1.0 KiB
Diff
From 04a7a672301bb07caea6a7cad8378f63f1fe3200 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Fri, 29 Mar 2013 09:16:28 +0400
|
|
Subject: [PATCH 15/47] COLLECT_GCC_OPTIONS
|
|
|
|
This patch adds --sysroot into COLLECT_GCC_OPTIONS which is used to
|
|
invoke collect2.
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
|
Upstream-Status: Pending
|
|
---
|
|
gcc/gcc.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
|
index a5fafbe5107..05896e19926 100644
|
|
--- a/gcc/gcc.c
|
|
+++ b/gcc/gcc.c
|
|
@@ -4654,6 +4654,15 @@ set_collect_gcc_options (void)
|
|
sizeof ("COLLECT_GCC_OPTIONS=") - 1);
|
|
|
|
first_time = TRUE;
|
|
+#ifdef HAVE_LD_SYSROOT
|
|
+ if (target_system_root_changed && target_system_root)
|
|
+ {
|
|
+ obstack_grow (&collect_obstack, "'--sysroot=", sizeof("'--sysroot=")-1);
|
|
+ obstack_grow (&collect_obstack, target_system_root,strlen(target_system_root));
|
|
+ obstack_grow (&collect_obstack, "'", 1);
|
|
+ first_time = FALSE;
|
|
+ }
|
|
+#endif
|
|
for (i = 0; (int) i < n_switches; i++)
|
|
{
|
|
const char *const *args;
|
|
--
|
|
2.12.2
|
|
|