Module Name: src
Committed By: mrg
Date: Wed Jun 22 05:15:15 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc: gcc.c
Log Message:
port this change from our gcc 4.1 tree. not entirely sure it's correct
yet, but not yet able to test ...
revision 1.5
date: 2011/04/10 16:50:18; author: joerg; state: Exp; lines: +2 -2
Reduce difference between src/tools/gcc and src/gnu/usr.bin/gcc4
configuration. All but the target to helper programs should be the same.
Mark include directories as sysroot-relative.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/gcc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/gcc.c
diff -u src/external/gpl3/gcc/dist/gcc/gcc.c:1.2 src/external/gpl3/gcc/dist/gcc/gcc.c:1.3
--- src/external/gpl3/gcc/dist/gcc/gcc.c:1.2 Tue Jun 21 02:41:36 2011
+++ src/external/gpl3/gcc/dist/gcc/gcc.c Wed Jun 22 05:15:15 2011
@@ -7108,15 +7108,18 @@
PREFIX_PRIORITY_LAST, 0, 1);
else if (*cross_compile == '0')
{
+/* XXXMRG not sure this one is right? */
+#if !defined(NETBSD_NATIVE) && !defined(NETBSD_TOOLS)
add_prefix (&startfile_prefixes,
concat (gcc_exec_prefix
? gcc_exec_prefix : standard_exec_prefix,
machine_suffix,
standard_startfile_prefix, NULL),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
+#endif /* NETBSD_NATIVE */
}
-#ifndef NETBSD_NATIVE
+#if !defined(NETBSD_NATIVE) && !defined(NETBSD_TOOLS)
/* Sysrooted prefixes are relocated because target_system_root is
also relocated by gcc_exec_prefix. */
if (*standard_startfile_prefix_1)
