[commit: ghc] master: Build system: don't set CLEANING=NO (47e00ec)

git at git.haskell.org git at git.haskell.org
Sat May 30 15:08:36 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/47e00ec4a85b492a1e9f8750b4ba12963a10d76a/ghc

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

commit 47e00ec4a85b492a1e9f8750b4ba12963a10d76a
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue May 26 16:22:57 2015 +0200

    Build system: don't set CLEANING=NO
    
    We only ever check if CLEANING=YES.
    
    [skip ci]


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

47e00ec4a85b492a1e9f8750b4ba12963a10d76a
 ghc.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 8ce26d2..3e7372a 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -100,10 +100,6 @@ else
 $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
 endif
 
-ifneq "$(CLEANING)" "YES"
-CLEANING = NO
-endif
-
 # -----------------------------------------------------------------------------
 # Misc GNU make utils
 
@@ -263,15 +259,13 @@ include rules/cmm-objs.mk
 # Suffix rules cause "make clean" to fail on Windows (trac #3233)
 # so we don't make any when cleaning.
 ifneq "$(CLEANING)" "YES"
-
 include rules/hs-suffix-rules-srcdir.mk
 include rules/hs-suffix-way-rules-srcdir.mk
 include rules/hs-suffix-way-rules.mk
 include rules/hi-rule.mk
 include rules/c-suffix-rules.mk
 include rules/cmm-suffix-rules.mk
-
-endif # CLEANING=YES
+endif
 
 # -----------------------------------------------------------------------------
 # Building package-data.mk files from .cabal files



More information about the ghc-commits mailing list