[commit: ghc] master: Build: remove more unnecessary CLEANING/=YES checks (5dd0286)

git at git.haskell.org git at git.haskell.org
Thu Jun 4 22:01:12 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5dd02864a844bcf6fe0018755ff261affdef3fea/ghc

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

commit 5dd02864a844bcf6fe0018755ff261affdef3fea
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu May 28 12:38:21 2015 +0200

    Build: remove more unnecessary CLEANING/=YES checks
    
    All these checks that CLEANING/=YES are no longer needed, because
    nowadays $1_$2_PROGNAME is always set explicitly, and $1_$2_PROG isn't.
    
    They were once introduce to allow `make clean` before `./configure`. I
    checked, and it still works.
    
    Remove the checks to make the build system a tiny bit shorter, and to
    no longer wonder why they are there.
    
    Differential Revision: https://phabricator.haskell.org/D941


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

5dd02864a844bcf6fe0018755ff261affdef3fea
 rules/build-perl.mk | 2 --
 rules/build-prog.mk | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/rules/build-perl.mk b/rules/build-perl.mk
index a6725ba..46cf053 100644
--- a/rules/build-perl.mk
+++ b/rules/build-perl.mk
@@ -24,13 +24,11 @@ $(call profStart, build-perl($1,$2))
 # $1 = dir
 # $2 = distdir
 
-ifneq "$$(CLEANING)" "YES"
 ifeq "$$($1_$2_PROGNAME)" ""
 $$(error $1_$2_PROGNAME is not set)
 endif
 ifneq "$$($1_$2_PROG)" ""
 $$(error $1_$2_PROG is set)
-endif
 $1_$2_PROG = $$($1_$2_PROGNAME)
 
 ifneq "$$($$($1_$2_PROG)_INPLACE)" ""
diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 3e9bc89..f2f6ad2 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -22,14 +22,12 @@ $(call profStart, build-prog($1,$2,$3))
 # $2 = distdir
 # $3 = GHC stage to use (0 == bootstrapping compiler)
 
-ifneq "$$(CLEANING)" "YES"
 ifeq "$$($1_$2_PROGNAME)" ""
 $$(error $1_$2_PROGNAME is not set)
 endif
 ifneq "$$($1_$2_PROG)" ""
 $$(error $1_$2_PROG is set)
 endif
-endif
 $1_$2_PROG = $$($1_$2_PROGNAME)$$(exeext$3)
 
 ifeq "$$(findstring $3,0 1 2)" ""
@@ -91,11 +89,9 @@ else
 $1_$2_INPLACE =
 endif
 else
-ifneq "$$(CLEANING)" "YES"
 ifneq "$$($$($1_$2_PROGNAME)_INPLACE)" ""
 $$(error $$($1_$2_PROGNAME)_INPLACE defined twice)
 endif
-endif
 ifeq "$$($1_$2_TOPDIR)" "YES"
 $$($1_$2_PROGNAME)_INPLACE = $$(INPLACE_TOPDIR)/$$($1_$2_PROG)
 else



More information about the ghc-commits mailing list