From 96454662c0c382ebd58d90fecdbcfda4a4e3000c Mon Sep 17 00:00:00 2001 From: Zoltan Somogyi Date: Thu, 27 Mar 2003 05:32:09 +0000 Subject: [PATCH] Pass $(ALL_GRADEFLAGS) to all invocations of the compiler, since Estimated hours taken: 0.2 Branches: main scripts/Mmake.rules: Pass $(ALL_GRADEFLAGS) to all invocations of the compiler, since the compiler now has sanity checks on option values that could be tripped with the default grade that may not be tripped with the actual desired grade. library/Mmakefile: Delete my previous "fix" for this problem, since it is not needed anymore. --- library/Mmakefile | 5 ++--- scripts/Mmake.rules | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/library/Mmakefile b/library/Mmakefile index da2e88861..17afc3044 100644 --- a/library/Mmakefile +++ b/library/Mmakefile @@ -80,9 +80,8 @@ endif # maintain the expected output of the debugging test cases in debugging grades. # # Always generate dependencies for use by `mmc --make'. -MCFLAGS += --strict-sequential --trace minimum $(ALL_GRADEFLAGS) \ - --generate-mmc-deps $(INTERMODULE_OPTS) \ - $(ENABLE_TERM_OPTS) $(CHECK_TERM_OPTS) +MCFLAGS += --strict-sequential --trace minimum --generate-mmc-deps \ + $(INTERMODULE_OPTS) $(ENABLE_TERM_OPTS) $(CHECK_TERM_OPTS) # The IL and Java implementations of the standard library are not yet complete, # so we need to pass `--allow-stubs' to get them to compile. diff --git a/scripts/Mmake.rules b/scripts/Mmake.rules index 3fc1a1917..00a0ca73d 100644 --- a/scripts/Mmake.rules +++ b/scripts/Mmake.rules @@ -136,13 +136,13 @@ endif # MMAKE_USE_MMC_MAKE == no ifeq ($(MMAKE_USE_MMC_MAKE), no) $(date0s_subdir)%.date0 : %.m - $(MCPI) $(ALL_MCPIFLAGS) $(*F) + $(MCPI) $(ALL_GRADEFLAGS) $(ALL_MCPIFLAGS) $(*F) $(dates_subdir)%.date : %.m - $(MCI) $(ALL_MCIFLAGS) $(*F) + $(MCI) $(ALL_GRADEFLAGS) $(ALL_MCIFLAGS) $(*F) $(date3s_subdir)%.date3 : %.m - $(MCSI) $(ALL_MCSIFLAGS) $(*F) + $(MCSI) $(ALL_GRADEFLAGS) $(ALL_MCSIFLAGS) $(*F) $(optdates_subdir)%.optdate : %.m $(MCOI) $(ALL_GRADEFLAGS) $(ALL_MCOIFLAGS) $(*F)