[commit: ghc] master: double-negate test for Stage1Only to fix `make clean` (7561e37)

git at git.haskell.org git at git.haskell.org
Sun Feb 9 14:04:00 UTC 2014


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

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

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

commit 7561e37103041d6691c70683f910cdb97952483a
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Feb 9 14:59:49 2014 +0100

    double-negate test for Stage1Only to fix `make clean`
    
    This was causing `utils/ghctags/dist-install` to not get removed
    on `make clean` as `Stage1Only` was unset. So testing for `!= YES` is
    less fragile than testing for `== NO` in this case.
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>


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

7561e37103041d6691c70683f910cdb97952483a
 ghc.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 6628878..288b113 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -427,7 +427,7 @@ endif
 
 # We normally install only the packages down to this point
 REGULAR_INSTALL_PACKAGES := $(addprefix libraries/,$(PACKAGES_STAGE1))
-ifeq "$(Stage1Only)" "NO"
+ifneq "$(Stage1Only)" "YES"
 REGULAR_INSTALL_PACKAGES += compiler
 endif
 REGULAR_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2))
@@ -464,7 +464,7 @@ endif
 
 # If we want to just install everything, then we want all the packages
 SUPERSIZE_INSTALL_PACKAGES := $(addprefix libraries/,$(PACKAGES_STAGE1))
-ifeq "$(Stage1Only)" "NO"
+ifneq "$(Stage1Only)" "YES"
 SUPERSIZE_INSTALL_PACKAGES += compiler
 endif
 SUPERSIZE_INSTALL_PACKAGES += $(addprefix libraries/,$(PACKAGES_STAGE2))
@@ -653,7 +653,7 @@ BUILD_DIRS += compiler
 BUILD_DIRS += utils/hsc2hs
 BUILD_DIRS += utils/ghc-pkg
 BUILD_DIRS += utils/testremove
-ifeq "$(Stage1Only)" "NO"
+ifneq "$(Stage1Only)" "YES"
 BUILD_DIRS += utils/ghctags
 endif
 BUILD_DIRS += utils/dll-split



More information about the ghc-commits mailing list