[m-rev.] for review: fix for rotd source bootstrap problem

[Fergus Henderson]

Estimated hours taken: 0.25

Fix a bug which caused problems when trying to bootstrap from the source
distribution.

compiler/Mmakefile:
	Build mlds_to_gcc.c and gcc.c rather than mlds_to_gcc.err and gcc.err.
	Make the `cs' target, which is used by the `tar' target in ../Mmakefile,
	depend on mlds_to_gcc.c and gcc.c.

Workspace: /mnt/mars/home/mars/fjh/ws1/mercury
Index: compiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.46
diff -u -d -r1.46 Mmakefile
--- compiler/Mmakefile	2001/07/03 09:49:35	1.46
+++ compiler/Mmakefile	2001/07/23 21:41:15
@@ -215,7 +215,9 @@
 # But we want to make sure that the GCC back-end continues to compile,
 # even when the compiler was configured without the GCC back-end.
 # So we include the following rules, which tell Mmake to build the
-# dependencies for mlds_to_gcc and to build mlds_to_gcc.err and gcc.err.
+# dependencies for mlds_to_gcc and to build mlds_to_gcc.c and gcc.c.
+# (We used to just build mlds_to_gcc.err, but that caused bootstrapping problems
+# with the source distribution; using the .c files is little more robust.)
 
 .PHONY: depend
 depend:		mlds_to_gcc.depend
@@ -223,7 +225,10 @@
 mlds_to_gcc.depend: regenerate_preprocessed_files
 
 .PHONY: mercury
-mercury:	mlds_to_gcc.err gcc.err
+mercury:	$(cs_subdir)mlds_to_gcc.c $(cs_subdir)gcc.c
+
+.PHONY: cs
+cs: 		$(cs_subdir)mlds_to_gcc.c $(cs_subdir)gcc.c
 
 #-----------------------------------------------------------------------------#
 

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------