[commit: nofib] master: Clean more generated files (f87d446)

git at git.haskell.org git at git.haskell.org
Thu Nov 22 11:41:14 UTC 2018


Repository : ssh://git@git.haskell.org/nofib

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f87d446b4e361cc82f219cf78917db9681af69b3/nofib

>---------------------------------------------------------------

commit f87d446b4e361cc82f219cf78917db9681af69b3
Author: Sebastian Graf <sebastian.graf at kit.edu>
Date:   Thu Nov 22 12:41:01 2018 +0100

    Clean more generated files
    
    Summary:
    When we don't remove the generated files, `make boot` won't regenerate
    them. That in turn leads to expected output failures after bumping
    `{FAST,NORM,SLOW}_OPTS`.
    
    Test Plan: make clean && make boot && make
    
    Reviewers: AndreasK, mpickering, osa1, alpmestan, O26 nofib
    
    Reviewed By: alpmestan
    
    Differential Revision: https://phabricator.haskell.org/D5365


>---------------------------------------------------------------

f87d446b4e361cc82f219cf78917db9681af69b3
 real/compress/Makefile         | 6 ++----
 shootout/k-nucleotide/Makefile | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/real/compress/Makefile b/real/compress/Makefile
index 2f87ccb..f366d2c 100644
--- a/real/compress/Makefile
+++ b/real/compress/Makefile
@@ -5,6 +5,8 @@ SRC_RUNTEST_OPTS += -stdout-binary
 
 SRCS = BinConv.hs BinTest.hs Decode.hs Defaults.hs Encode.hs Main.hs PTTrees.hs Uncompress.hs
 
+CLEAN_FILES += compress.stdin compress.stdout
+
 Lzw_HC_OPTS = -cpp
 
 include $(TOP)/mk/target.mk
@@ -16,7 +18,3 @@ compress.stdin : compress.faststdin
 
 compress.stdout : compress.stdin compress
 	./compress < compress.stdin > compress.stdout
-
-
-clean ::
-	rm -f compress.stdin compress.stdout
diff --git a/shootout/k-nucleotide/Makefile b/shootout/k-nucleotide/Makefile
index dad274a..56870ff 100644
--- a/shootout/k-nucleotide/Makefile
+++ b/shootout/k-nucleotide/Makefile
@@ -7,6 +7,8 @@ FAST_OPTS = 250000
 NORM_OPTS = 500000
 SLOW_OPTS = 25000000  # official shootout setting
 
+CLEAN_FILES += fasta-c k-nucleotide.*stdin
+
 # The benchmark game also uses -fllvm, which we can't since it might
 # not be available on the developer's machine.
 HC_OPTS += -XBangPatterns -package bytestring



More information about the ghc-commits mailing list