[commit: ghc] master: Build system: don't build runghc if GhcWithInterpreter=NO (#10261) (508a3a3)

git at git.haskell.org git at git.haskell.org
Sat May 30 15:09:04 UTC 2015


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

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

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

commit 508a3a33988d2872f580d8b727036f7f443d8b6d
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu May 28 19:34:15 2015 +0200

    Build system: don't build runghc if GhcWithInterpreter=NO (#10261)
    
    To test:
      * run `make clean` in utils/runghc
      * make sure inplace/bin doesn't contain runghc
      * set GhcWithInterpreter=NO in build.mk
      * run `make`
      * note that inplace/bin doesn't contain runghc
    
    It won't be installed either, nor will runhaskell.
    
    Differential Revision: https://phabricator.haskell.org/D920


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

508a3a33988d2872f580d8b727036f7f443d8b6d
 ghc.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ghc.mk b/ghc.mk
index 5c239cd..5a1845c 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -661,7 +661,11 @@ BUILD_DIRS += utils/dll-split
 BUILD_DIRS += utils/ghc-pwd
 BUILD_DIRS += utils/ghc-cabal
 BUILD_DIRS += utils/hpc
+ifeq "$(GhcWithInterpreter)" "YES"
 BUILD_DIRS += utils/runghc
+else ifeq "$(CLEANING)" "YES"
+BUILD_DIRS += utils/runghc
+endif
 BUILD_DIRS += ghc
 
 ifneq "$(BINDIST)" "YES"



More information about the ghc-commits mailing list