[m-rev.] diff: fix `mmc --make' bug

Simon Taylor stayl at cs.mu.OZ.AU
Wed Jul 17 17:09:33 AEST 2002


Estimated hours taken: 0.25
Branches: main

compiler/make.module_target.m:
	Fix a bug which caused compilation to continue
	even after errors.

Index: make.module_target.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/make.module_target.m,v
retrieving revision 1.10
diff -u -u -r1.10 make.module_target.m
--- make.module_target.m	4 Jul 2002 14:18:07 -0000	1.10
+++ make.module_target.m	17 Jul 2002 07:06:28 -0000
@@ -164,14 +164,22 @@
 	%
 	globals__io_lookup_bool_option(keep_going, KeepGoing),
 	foldl2_maybe_stop_at_error(KeepGoing, make_module_target,
-		DepFilesToMake, _, Info0, Info1),
+		DepFilesToMake, MakeDepsSuccess, Info0, Info1),
 
 	%
 	% Check that the target files exist.
 	%
 	list__map_foldl2(get_target_timestamp, TouchedTargetFiles,
 			TargetTimestamps, Info1, Info2),
-	( { list__member(error(_), TargetTimestamps) } ->
+	(
+		{ MakeDepsSuccess = no }
+	->
+		debug_file_msg(TargetFile, "error making dependencies"),
+		{ DepsResult = error },
+		{ Info = Info2 }
+	;
+		{ list__member(error(_), TargetTimestamps) }
+	->
 		debug_file_msg(TargetFile, "target file does not exist"),
 		{ DepsResult = out_of_date },
 		{ Info = Info2 }
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list