[PATCH] Make lack of gcc directory non-fatal again in Makefile.tpl

[PATCH] Make lack of gcc directory non-fatal again in Makefile.tpl

[Christopher Faylor]

Somewhere in the last few days the behavior of the top-level Makefile
seems to have changed such that it dies if there is no gcc directory.
I'm not 100% sure that this is the correct way to fix this problem but
the patch below rectifies that behavior.

Ok to apply?

cgf

2004-06-02  Christopher Faylor  <cgf@alum.bu.edu>

        * Makefile.tpl (all-gcc): Fix so that the nonexistence of the gcc
        directory is not considered to be a fatal.
        * Makefile.in: Regenerate.

Index: Makefile.tpl
===================================================================
RCS file: /cvs/uberbaum/Makefile.tpl,v
retrieving revision 1.104
diff -u -p -r1.104 Makefile.tpl
--- Makefile.tpl	1 Jun 2004 08:11:41 -0000	1.104
+++ Makefile.tpl	3 Jun 2004 03:20:50 -0000
@@ -1207,12 +1207,13 @@ all-gcc: configure-gcc
 @if gcc-no-bootstrap
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	cd gcc || exit 0; \
 	$(SET_LIB_PATH) \
 	$(GCC_HOST_EXPORTS) \
 	if [ -f gcc/stage_last ] ; then \
-	  (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
+	  $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap; \
 	else \
-	  (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
+	  $(MAKE) $(GCC_FLAGS_TO_PASS) all; \
 	fi
 
 # Building GCC uses some tools for rebuilding "source" files
Index: Makefile.in
===================================================================
RCS file: /cvs/uberbaum/Makefile.in,v
retrieving revision 1.222
diff -u -p -r1.222 Makefile.in
--- Makefile.in	1 Jun 2004 08:11:32 -0000	1.222
+++ Makefile.in	3 Jun 2004 03:20:55 -0000
@@ -27682,12 +27682,13 @@ all-gcc: configure-gcc
 @if gcc-no-bootstrap
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	cd gcc || exit 0; \
 	$(SET_LIB_PATH) \
 	$(GCC_HOST_EXPORTS) \
 	if [ -f gcc/stage_last ] ; then \
-	  (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
+	  $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap; \
 	else \
-	  (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
+	  $(MAKE) $(GCC_FLAGS_TO_PASS) all; \
 	fi
 
 # Building GCC uses some tools for rebuilding "source" files

Re: [PATCH] Make lack of gcc directory non-fatal again in Makefile.tpl

[Daniel Jacobowitz]

On Wed, Jun 02, 2004 at 11:31:58PM -0400, Christopher Faylor wrote:
> 
> Somewhere in the last few days the behavior of the top-level Makefile
> seems to have changed such that it dies if there is no gcc directory.
> I'm not 100% sure that this is the correct way to fix this problem but
> the patch below rectifies that behavior.
> 
> Ok to apply?

I don't think it went to gcc-patches, but Paolo posted an (I think)
better fix for this to binutils and gdb-patches.  He's away and can't
check it in...

-- 
Daniel Jacobowitz

Re: [PATCH] Make lack of gcc directory non-fatal again in Makefile.tpl

[Christopher Faylor]

On Thu, Jun 03, 2004 at 12:02:47AM -0400, Daniel Jacobowitz wrote:
>On Wed, Jun 02, 2004 at 11:31:58PM -0400, Christopher Faylor wrote:
>> 
>> Somewhere in the last few days the behavior of the top-level Makefile
>> seems to have changed such that it dies if there is no gcc directory.
>> I'm not 100% sure that this is the correct way to fix this problem but
>> the patch below rectifies that behavior.
>> 
>> Ok to apply?
>
>I don't think it went to gcc-patches, but Paolo posted an (I think)
>better fix for this to binutils and gdb-patches.  He's away and can't
>check it in...

Hmm.  I specifically checked gcc-patches since that's where I thought
the master for this file resided.

I'll check in Paolo's patch as soon as I can resurrect a clean copy.

cgf