[m-rev.] diff: gcc back-end: Make-lang.in fixes

[Fergus Henderson]

Estimated hours taken: 0.5
Branches: main, gcc_3_3

gcc/mercury/Make-lang.in
	Fix a couple of bugs:
	- it was missing the dependencies for libmercury_compile.a (etc.)
	- need to work around a problem with `-o' not working properly

Workspace: /home/ceres/fjh/ws-gcc-basic-improvements-patched/mercury-gcc
cvs diff: Diffing gcc
cvs diff: Diffing gcc/mercury
Index: gcc/mercury/Make-lang.in
===================================================================
RCS file: /home/mercury1/repository/gcc/mercury/Make-lang.in,v
retrieving revision 1.7.2.1
diff -u -d -p -r1.7.2.1 Make-lang.in
--- gcc/mercury/Make-lang.in	12 Sep 2002 16:43:44 -0000	1.7.2.1
+++ gcc/mercury/Make-lang.in	19 Sep 2002 15:36:33 -0000
@@ -123,7 +123,7 @@ mercury/testmercury$(exeext): mercury/te
 # Ensure that we build the Mercury compiler front-end library
 # before linking mercury1
 
-mercury1$(exeext): libmmc
+$(MERCURY_FRONT_END_LIBS): libmmc
 
 .PHONY: libmmc
 libmmc:
@@ -166,10 +166,17 @@ mercury/test.o: mercury/test.s
 	$(CC) -o $@ -c $(ALL_CFLAGS) $(INCLUDES) $< 
 
 #generate the code
+# XXX Note that `-o' doesn't work as you might expect, because the
+# Mercury front-end thinks it is in control and that the `.s'
+# file should therefore go in the current directory, based
+# on the module name (not the file name), since that is
+# where Mmake will expect to fine it.  Hence the need for
+# the command `mv test.s mercury/test.s'.
 mercury/test.s: mercury1$(exeext) $(srcdir)/mercury/test.m
 	./mercury1$(exeext) -quiet -g -O2 \
 		--mmc-flag=-I$(MERCURY_FRONT_END_SRC_DIR)/library \
 		--mmc-flag=-O2 $(srcdir)/mercury/test.m -o $@
+	mv test.s mercury/test.s
 
 $(INTL_TARGETS): 
 

-- 
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
--------------------------------------------------------------------------