Module Name: src
Committed By: mrg
Date: Tue Jun 28 07:52:40 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc: gcc.c
Log Message:
fix a merge error only seen with NETBSD_NATIVE defined.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 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.3 src/external/gpl3/gcc/dist/gcc/gcc.c:1.4
--- src/external/gpl3/gcc/dist/gcc/gcc.c:1.3 Wed Jun 22 05:15:15 2011
+++ src/external/gpl3/gcc/dist/gcc/gcc.c Tue Jun 28 07:52:40 2011
@@ -3665,8 +3665,8 @@
standard_libexec_prefix);
if (gcc_exec_prefix)
xputenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, NULL));
- }
#endif
+ }
else
{
/* make_relative_prefix requires a program name, but
