Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3/gcc/dist/gcc fix a merge error only seen with ...



details:   https://anonhg.NetBSD.org/src/rev/2ad89423e2f5
branches:  trunk
changeset: 766579:2ad89423e2f5
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jun 28 07:52:40 2011 +0000

description:
fix a merge error only seen with NETBSD_NATIVE defined.

diffstat:

 external/gpl3/gcc/dist/gcc/gcc.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r 22fba5d3494e -r 2ad89423e2f5 external/gpl3/gcc/dist/gcc/gcc.c
--- a/external/gpl3/gcc/dist/gcc/gcc.c  Tue Jun 28 07:50:03 2011 +0000
+++ b/external/gpl3/gcc/dist/gcc/gcc.c  Tue Jun 28 07:52:40 2011 +0000
@@ -3665,8 +3665,8 @@
                                             standard_libexec_prefix);
       if (gcc_exec_prefix)
        xputenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, NULL));
-    }
-#endif
+#endif
+    }
   else
     {
       /* make_relative_prefix requires a program name, but



Home | Main Index | Thread Index | Old Index