summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--driver/ghci/ghc.mk2
-rw-r--r--ghc.mk8
2 files changed, 3 insertions, 7 deletions
diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index ad11ee1528..c231347c0b 100644
--- a/driver/ghci/ghc.mk
+++ b/driver/ghci/ghc.mk
@@ -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 f469beec50..91ddbe3824 100644
--- 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