small build system tweak

2ede632e · ian@well-typed.com · 01ac518a · 2ede632e · 2ede632e
Commit 2ede632e authored Mar 02, 2013 by ian@well-typed.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

driver/ghci/ghc.mk driver/ghci/ghc.mk +2 -0

ghc.mk ghc.mk +1 -7

No files found.
--- 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

--- 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