[m-rev.] diff: pass ALL_GRADEFLAGS when making `.opt' files

Simon Taylor stayl at cs.mu.OZ.AU
Wed Jun 26 18:21:15 AEST 2002


Estimated hours taken: 0.2
Branches: main

scripts/Mmake.rules:
compiler/modules.m:
	In the presence of foreign code the `.opt' and `.trans_opt' files
	aren't grade independent, so pass $(ALL_GRADEFLAGS) to mmc
	when creating them.

Index: scripts/Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.128
diff -u -u -r1.128 Mmake.rules
--- scripts/Mmake.rules	25 Jun 2002 14:24:10 -0000	1.128
+++ scripts/Mmake.rules	26 Jun 2002 08:04:59 -0000
@@ -139,10 +139,10 @@
 	$(MCSI) $(ALL_MCSIFLAGS) $(*F)
 
 $(optdates_subdir)%.optdate : %.m
-	$(MCOI) $(ALL_MCOIFLAGS) $(*F)
+	$(MCOI) $(ALL_GRADEFLAGS) $(ALL_MCOIFLAGS) $(*F)
 
 $(trans_opt_dates_subdir)%.trans_opt_date : %.m
-	$(MCTOI) $(ALL_MCTOIFLAGS) $(*F)
+	$(MCTOI) $(ALL_GRADEFLAGS) $(ALL_MCTOIFLAGS) $(*F)
 
 # Be very careful about changing the following rules.
 # The `@:' is a silent do-nothing command.
Index: compiler/modules.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modules.m,v
retrieving revision 1.236
diff -u -u -r1.236 modules.m
--- compiler/modules.m	25 Jun 2002 14:24:04 -0000	1.236
+++ compiler/modules.m	26 Jun 2002 08:16:01 -0000
@@ -2450,11 +2450,12 @@
 				Date3FileName, " : ", SourceFileName, "\n",
 				"\t$(MCSI) $(ALL_MCSIFLAGS) ", ModuleArg, "\n",
 				OptDateFileName, " : ", SourceFileName, "\n",
-				"\t$(MCOI) $(ALL_MCOIFLAGS) ", ModuleArg, "\n",
+				"\t$(MCOI) $(ALL_GRADEFLAGS) ",
+					"$(ALL_MCOIFLAGS) ", ModuleArg, "\n",
 				TransOptDateFileName, " : ", SourceFileName,
 					"\n",
-				"\t$(MCTOI) $(ALL_MCTOIFLAGS) ", ModuleArg,
-					"\n",
+				"\t$(MCTOI) $(ALL_GRADEFLAGS) ",
+					"$(ALL_MCTOIFLAGS) ", ModuleArg, "\n",
 				CDateFileName, " : ", SourceFileName, "\n",
 				"\t$(MCG) $(ALL_GRADEFLAGS) $(ALL_MCGFLAGS) ",
 					ModuleArg, " > ", ErrFileName,
--------------------------------------------------------------------------
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