diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-02 01:11:58 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-02 01:11:58 +0000 |
| commit | 2ede632e20450baef41241e8cbf5d18db4db8f4e (patch) | |
| tree | 37afe1a07b691c30871778d7cd523a9e6787c1d0 | |
| parent | 01ac518a5970f7cf63991dd914c5580242166249 (diff) | |
| download | haskell-2ede632e20450baef41241e8cbf5d18db4db8f4e.tar.gz | |
small build system tweak
| -rw-r--r-- | driver/ghci/ghc.mk | 2 | ||||
| -rw-r--r-- | ghc.mk | 8 |
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 @@ -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 |