[commit: ghc] master: Build: remove unnecessary CLEANING/=YES check (cac68d0)

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


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

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

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

commit cac68d0d340f93738db79ad867fe3f0eec515075
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue May 26 21:00:04 2015 +0200

    Build: remove unnecessary CLEANING/=YES check
    
    The comment "INPLACE_BIN might be empty if we're distcleaning" is no
    longer true, and the check that CLEANING isn't YES isn't necessary.
    
    It was introduced in cd12c32de77ac18a69ed1733a558095567ec5ba8, to
    "make repeated 'make distclean' not fail", and and later revised in
    39253008705e3ca590afdfa1b87bfbb5a16da7e7. It was needed because
    INPLACE_BIN was defined in config.mk.
    
    Commit 6793a033e1ce41f77316675e8f7aa83196a9b211 however, two days
    later, introduced a better solution to this problem: "Move the fixed
    paths out of config.mk, so cleaning works without configuring"
    
    So here we remove the original comment and check. One less thing to
    worry about when trying to understand the build system.
    
    Differential Revision: https://phabricator.haskell.org/D940


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

cac68d0d340f93738db79ad867fe3f0eec515075
 rules/build-perl.mk | 4 ----
 rules/build-prog.mk | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/rules/build-perl.mk b/rules/build-perl.mk
index 51e92f7..a6725ba 100644
--- a/rules/build-perl.mk
+++ b/rules/build-perl.mk
@@ -51,8 +51,6 @@ $(call clean-target,$1,$2,$1/$2 $$($1_$2_INPLACE))
 .PHONY: clean_$1
 clean_$1 : clean_$1_$2
 
-# INPLACE_BIN etc. might be empty if we're cleaning
-ifneq "$$(CLEANING)" "YES"
 ifneq "$$(BINDIST)" "YES"
 $1/$2/$$($1_$2_PROG).prl: $1/$$($1_PERL_SRC) $$$$(unlit_INPLACE) | $$$$(dir $$$$@)/.
 	"$$(unlit_INPLACE)" $$(UNLIT_OPTS) $$< $$@
@@ -67,8 +65,6 @@ $1/$2/$$($1_$2_PROG): $1/$2/$$($1_$2_PROG).prl
 $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) | $$$$(dir $$$$@)/.
 	"$$(CP)" $$< $$@
 	$$(EXECUTABLE_FILE) $$@
-
-endif
 endif
 
 ifeq "$$($1_$2_INSTALL)" "YES"
diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 10d31c5..3e9bc89 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -287,13 +287,10 @@ endif
 endif
 endif
 
-# INPLACE_BIN might be empty if we're distcleaning
-ifneq "$$(CLEANING)" "YES"
 ifeq "$$($1_$2_INSTALL_INPLACE)" "YES"
 $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG_INPLACE) | $$$$(dir $$$$@)/.
 	$$(INSTALL) -m 755 $$< $$@
 endif
-endif
 
 endif # BINDIST=YES
 



More information about the ghc-commits mailing list