small build system tweak
authorIan Lynagh <ian@well-typed.com>
Sat, 2 Mar 2013 01:11:58 +0000 (01:11 +0000)
committerIan Lynagh <ian@well-typed.com>
Sat, 2 Mar 2013 01:11:58 +0000 (01:11 +0000)
driver/ghci/ghc.mk
ghc.mk

index ad11ee1..c231347 100644 (file)
@@ -10,6 +10,7 @@
 #
 # -----------------------------------------------------------------------------
 
+ifeq "$(GhcWithInterpreter)" "YES"
 ifneq "$(Windows_Host)" "YES"
 
 install: install_driver_ghci
@@ -62,4 +63,5 @@ install_driver_ghcii:
        $(EXECUTABLE_FILE) $(GHCII_SCRIPT_VERSIONED)
 
 endif
+endif
 
diff --git a/ghc.mk b/ghc.mk
index f469bee..91ddbe3 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -607,14 +607,8 @@ ifneq "$(BINDIST)" "YES"
 BUILD_DIRS += $(GHC_GENPRIMOP_DIR)
 endif
 
-ifeq "$(Stage1Only)-$(phase)" "YES-final"
-MAYBE_GHCI=
-else
-MAYBE_GHCI=driver/ghci
-endif
-
 BUILD_DIRS += driver
-BUILD_DIRS += $(MAYBE_GHCI)
+BUILD_DIRS += driver/ghci
 BUILD_DIRS += driver/ghc
 BUILD_DIRS += driver/haddock
 BUILD_DIRS += libffi