Move validate cleaning from distclean to clean
authorDouglas Wilson <douglas.wilson@gmail.com>
Tue, 22 Aug 2017 12:44:00 +0000 (08:44 -0400)
committerBen Gamari <ben@smart-cactus.org>
Tue, 22 Aug 2017 15:09:05 +0000 (11:09 -0400)
This bit me today: I was in validate mode without realising it and "make
clean" didn't help. I don't see a reason for this to be in distclean, as
it isn't generated by ./configure, which is the rule described in
https://ghc.haskell.org/trac/ghc/wiki/Building/Using

Test Plan: Is there a reason for this to be in distclean?

Reviewers: austin, bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie

Differential Revision: https://phabricator.haskell.org/D3814

ghc.mk

diff --git a/ghc.mk b/ghc.mk
index 55cc119..4a2f703 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -1366,6 +1366,8 @@ clean_files :
        $(call removeTrees,inplace/bin)
        $(call removeTrees,inplace/lib)
        $(call removeTrees,libraries/bootstrapping.conf)
+# Clean the files that ./validate creates.
+       $(call removeFiles,mk/are-validating.mk)
 
 .PHONY: clean_libraries
 clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES_STAGE1) $(PACKAGES_STAGE2))
@@ -1398,9 +1400,6 @@ clean_bindistprep:
        $(call removeTrees,bindistprep/)
 
 distclean : clean
-# Clean the files that ./validate creates.
-       $(call removeFiles,mk/are-validating.mk)
-
 # Clean the files that we ask ./configure to create.
        $(call removeFiles,mk/config.mk)
        $(call removeFiles,mk/install.mk)