re PR bootstrap/35273 (Bootstrap of mingw32 using non-MSYS shell broken)

PR bootstrap/35273
* config.build (build_file_translate): Set to `CMD //c' only if
it works.
* Makefile.in (build_file_translate): Improve comment.

From-SVN: r132528

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d88c21da38298e0e26ee037e8de599c11f343561..b04552262659de8a2a523dd7927c0fc21b9718dc 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       PR bootstrap/35273
+       * config.build (build_file_translate): Set to `CMD //c' only if
+       it works.
+       * Makefile.in (build_file_translate): Improve comment.
+
 2008-02-21  Jan Hubicka  <jh@suse.cz>
 
        * predict.def (PRED_TREE_OPCODE_POSITIVE, PRED_TREE_OPCODE_NONEQUAL,

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index be9faaa8d98f4cf0f1e896c1fea3c7ab9485c084..a87e3bb663e76c758fad80664e05bd11fbb798d8 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2,8 +2,8 @@
 # Run 'configure' to generate Makefile from Makefile.in
 
 # Copyright (C) 1987, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
-# 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-# Free Software Foundation, Inc.
+# 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+# 2008 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -253,7 +253,9 @@ POD2MAN = pod2man --center="GNU" --release="gcc-$(version)"
 # do not correctly set the timestamp due to buggy versions of `utime'
 # in the kernel.  So, we use `echo' instead.
 STAMP = echo timestamp >
-# Translate absolute file names to w32 paths.
+# If necessary (e.g., when using the MSYS shell on Microsoft Windows)
+# translate the shell's notion of absolute pathnames to the native
+# spelling.
 build_file_translate = @build_file_translate@
 
 # Make sure the $(MAKE) variable is defined.

diff --git a/gcc/config.build b/gcc/config.build
index 62486db58b4914a96918c6bea4d28acfbcfab231..d08143493d99bc45fc638f14f21957d1d4c5c2aa 100644 (file)
--- a/gcc/config.build
+++ b/gcc/config.build
@@ -1,5 +1,5 @@
 # GCC build-specific configuration file.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2007
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2007, 2008
 # Free Software Foundation, Inc.
 
 #This file is part of GCC.
@@ -80,7 +80,11 @@ case $build in
   i[34567]86-*-mingw32* | x86_64-*-mingw*)
     build_xm_file=i386/xm-mingw32.h
     build_exeext=.exe
-    build_file_translate="CMD //C"
+    t=`(CMD //c echo /c) 2>/dev/null`
+    case $t in ?:*)
+      build_file_translate="CMD //c"
+      ;;
+    esac
     ;;
   i[34567]86-pc-msdosdjgpp*)
     build_xm_file=i386/xm-djgpp.h