Re: gdb and binutils build broken -- Makefile.def gcc-no-bootstrap change

[Christopher Faylor <me at cgf dot cx>]

On Tue, Jun 01, 2004 at 06:32:53PM +0200, Paolo Bonzini wrote:
>Here is the least invasive patch I could do to fix the problem.  It is 
>actually better than the previous solution also because it limits the 
>number of interacting sed passes to resolve @if's, and it allows 
>conditionals like "@if as-bootstrap".
>
>I think it qualifies as an obvious fix but I don't have CVS available 
>right now, would you please commit it for me to both gcc and src?
>
>Thank you very much, I apologize.

I've taken the liberty of checking this into gcc and src.  It affects
cygwin builds too, FWIW.

This patch is infinitely better than the one I posted on gcc-patches
so that one is withdrawn.

cgf

>2004-06-01  Paolo Bonzini  <bonzini@gnu.org>
>
>	* configure.in: Fix --enable-bootstrap breakage
>	introduced in trees without gcc.
>	* configure: Regenerate.
>
>Index: configure.in
>===================================================================
>RCS file: /cvs/gcc/gcc/configure.in,v
>retrieving revision 1.293
>diff -u -r1.293 configure.in
>--- configure.in	1 Jun 2004 07:54:44 -0000	1.293
>+++ configure.in	1 Jun 2004 16:28:30 -0000
>@@ -1730,6 +1730,31 @@
> # to maintain later.  In this particular case, you just have to be careful
> # not to nest @if/@endif pairs, because configure will not warn you at all.
> 
>+AC_ARG_ENABLE([bootstrap],
>+[  --enable-bootstrap     Enable bootstrapping [no]],,
>+enable_bootstrap=no)
>+if test -d ${srcdir}/gcc; then
>+  case "$host:$target:$enable_bootstrap" in
>+    $build:$build:yes | *:no) ;;
>+    *:yes) AC_MSG_ERROR([cannot bootstrap a cross-compiler]) ;;
>+    *) AC_MSG_ERROR([invalid option for --enable-bootstrap]) ;;
>+  esac
>+else
>+  if test $enable_bootstrap = yes; then
>+    AC_MSG_ERROR([cannot bootstrap without a compiler])
>+  fi
>+fi
>+
>+case "$enable_bootstrap" in
>+  yes)
>+    default_target=bootstrap
>+    bootstrap_suffix=bootstrap ;;
>+  no)
>+    default_target=all
>+    bootstrap_suffix=no-bootstrap ;;
>+esac
>+AC_SUBST(default_target)
>+
> for module in ${build_modules} ; do
>   if test -z "${no_recursion}" \
>      && test -f ${build_subdir}/${module}/Makefile; then
>@@ -1738,7 +1763,9 @@
>   fi
>   extrasub="$extrasub
> /^@if build-$module\$/d
>-/^@endif build-$module\$/d"
>+/^@endif build-$module\$/d
>+/^@if build-$module-$bootstrap_suffix\$/d
>+/^@endif build-$module-$bootstrap_suffix\$/d"
> done
> for module in ${configdirs} ; do
>   if test -z "${no_recursion}" \
>@@ -1748,7 +1775,9 @@
>   fi
>   extrasub="$extrasub
> /^@if $module\$/d
>-/^@endif $module\$/d"
>+/^@endif $module\$/d
>+/^@if $module-$bootstrap_suffix\$/d
>+/^@endif $module-$bootstrap_suffix\$/d"
> done
> for module in ${target_configdirs} ; do
>   if test -z "${no_recursion}" \
>@@ -1758,38 +1787,11 @@
>   fi
>   extrasub="$extrasub
> /^@if target-$module\$/d
>-/^@endif target-$module\$/d"
>+/^@endif target-$module\$/d
>+/^@if target-$module-$bootstrap_suffix\$/d
>+/^@endif target-$module-$bootstrap_suffix\$/d"
> done
> 
>-AC_ARG_ENABLE([bootstrap],
>-[  --enable-bootstrap     Enable bootstrapping [no]],,
>-enable_bootstrap=no)
>-if test -d ${srcdir}/gcc; then
>-  case "$host:$target:$enable_bootstrap" in
>-    $build:$build:yes | *:no) ;;
>-    *:yes) AC_MSG_ERROR([cannot bootstrap a cross-compiler]) ;;
>-    *) AC_MSG_ERROR([invalid option for --enable-bootstrap]) ;;
>-  esac
>-else
>-  if test $enable_bootstrap = yes; then
>-    AC_MSG_ERROR([cannot bootstrap without a compiler])
>-  fi
>-fi
>-
>-case "$enable_bootstrap" in
>-  yes)
>-    default_target=bootstrap
>-    extrasub="$extrasub
>-/^@if gcc-bootstrap\$/d
>-/^@endif gcc-bootstrap\$/d" ;;
>-  no)
>-    default_target=all
>-    extrasub="$extrasub
>-/^@if gcc-no-bootstrap\$/d
>-/^@endif gcc-no-bootstrap\$/d" ;;
>-esac
>-AC_SUBST(default_target)
>-
> extrasub="$extrasub
> /^@if /,/^@endif /d"
>