Re: mingw svn trunk failure

[Carlos O'Donell <carlos@codesourcery.com>]

On Tue, Dec 19, 2006 at 07:29:17PM -0500, Bob Rossi wrote:
> I'm sorry. I've run it 2 ways. With prefix=/c/mingw and with
> prefix=/mingw. prefix=/mingw is the historically correct way to do this
> from what I understand. I only tried it with /c/mingw once as a test to
> see if it would work around the problem I found.
> 
> With --prefix=/mingw my configure line was,
> 
> mkdir gcc-builddir-0
> cd gcc-builddir-0
> ../gcc/configure \
> --disable-werror \
> --with-gmp=/home/bobbybrasko/gcc/gmp/gmp \
> --with-mpfr=/home/bobbybrasko/gcc/mpfr/prefixdir \
> --host=mingw32 \
> --target=mingw32 \

What does your 'build' default to?

> --prefix=/mingw \
> --program-suffix="-4.1" \
> --with-gcc \
> --with-gnu-ld \
> --with-gnu-as \
> --enable-threads=win32 \
> --disable-nls \
> --enable-languages=c,c++ \
> --disable-win32-registry \
> --disable-shared \
> --enable-static \
> --without-x \
> --enable-libstdcxx-debug \
> 2>&1 | tee configure-out.txt
> 
> Here was the build line,
> cd gcc-builddir-0
> make \
> CFLAGS="-O2 -fomit-frame-pointer" \
> CXXFLAGS="-mthreads -fno-omit-frame-pointer -O2" \
> LDFLAGS=-s \
> bootstrap 2>&1 | tee make-out.txt
> 
> And the debug info was found here,
>   http://gcc.gnu.org/ml/gcc-patches/2006-12/msg01356.html
> p->fname=/mingw/include cpp_PREFIX=C:/mingw cpp_PREFIX_len=8
> 
> Sorry about the confusion.

No worries. I'm sorry this broke the bootstrap process. We'll get it
fixed with a little more work :-)

I have a new patch for you if you want to try. This one is completely
untested, but I think it will do what you need.

If you can test this I would be *very* grateful, and then I can get this
upstream.

Cheers,
Carlos.
-- 
Carlos O'Donell
CodeSourcery
carlos@codesourcery.com
(650) 331-3385 x716

2006-12-19  Carlos O'Donell  <carlos@codesourcery.com>

	* gcc/c-incpath.c (add_standard_paths): Only rewrite paths
	that start with the configured prefix.

Index: gcc/c-incpath.c
===================================================================
--- gcc/c-incpath.c	(revision 120053)
+++ gcc/c-incpath.c	(working copy)
@@ -164,13 +164,12 @@ add_standard_paths (const char *sysroot,
 	  /* Should this directory start with the sysroot?  */
 	  if (sysroot && p->add_sysroot)
 	    str = concat (sysroot, p->fname, NULL);
-	  else if (!p->add_sysroot && relocated)
+	  else if (!p->add_sysroot && relocated
+		   && strncmp (p->fname, cpp_PREFIX, cpp_PREFIX_len) == 0)
 	    {
 	      /* If the compiler is relocated, and this is a configured 
 		 prefix relative path, then we use gcc_exec_prefix instead 
 		 of the configured prefix.  */
-	      gcc_assert (strncmp (p->fname, cpp_PREFIX,
-				     cpp_PREFIX_len) == 0);
 	      str = concat (gcc_exec_prefix, p->fname
 			      + cpp_PREFIX_len, NULL);
 	      str = update_path (str, p->component);