diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-01-02 20:49:07 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-01-02 21:10:45 +0000 |
| commit | 71feb1025eed0c3cc849c85e2b00e16bc1a21790 (patch) | |
| tree | fb51356edbfbf3d752b5f5d869ee64a21dfab475 /ghc.mk | |
| parent | b13d546f9c454e6d2a15c20a3e10ec47328e33db (diff) | |
| download | haskell-71feb1025eed0c3cc849c85e2b00e16bc1a21790.tar.gz | |
Ship transformers with GHC
This means that we can use the standard MonadIO class, rather than
needing our own copy.
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -330,7 +330,7 @@ endif # They do not say "this package will be built"; see $(PACKAGES_xx) for that # Packages that are built but not installed -PKGS_THAT_ARE_INTREE_ONLY := haskeline transformers terminfo xhtml +PKGS_THAT_ARE_INTREE_ONLY := haskeline terminfo xhtml PKGS_THAT_ARE_DPH := \ dph/dph-base \ @@ -355,7 +355,7 @@ PKGS_THAT_USE_TH := $(PKGS_THAT_ARE_DPH) # # We assume that the stage0 compiler has a suitable bytestring package, # so we don't have to include it below. -PKGS_THAT_BUILD_WITH_STAGE0 = Cabal/Cabal hpc binary bin-package-db hoopl +PKGS_THAT_BUILD_WITH_STAGE0 = Cabal/Cabal hpc binary bin-package-db hoopl transformers # $(EXTRA_PACKAGES) is another classification, of packages built but # not installed @@ -1337,17 +1337,17 @@ BINDIST_LIBRARY_FLAGS = --enable-library-vanilla --disable-shared endif BINDIST_LIBRARY_FLAGS += --disable-library-prof -.PHONY: validate_build_transformers -validate_build_transformers: - cd libraries/transformers && "$(BINDIST_PREFIX)/bin/ghc" --make Setup - cd libraries/transformers && ./Setup configure --with-ghc="$(BINDIST_PREFIX)/bin/ghc" $(BINDIST_HADDOCK_FLAG) $(BINDIST_LIBRARY_FLAGS) --global --builddir=dist-bindist --prefix="$(BINDIST_PREFIX)" - cd libraries/transformers && ./Setup build --builddir=dist-bindist +.PHONY: validate_build_xhtml +validate_build_xhtml: + cd libraries/xhtml && "$(BINDIST_PREFIX)/bin/ghc" --make Setup + cd libraries/xhtml && ./Setup configure --with-ghc="$(BINDIST_PREFIX)/bin/ghc" $(BINDIST_HADDOCK_FLAG) $(BINDIST_LIBRARY_FLAGS) --global --builddir=dist-bindist --prefix="$(BINDIST_PREFIX)" + cd libraries/xhtml && ./Setup build --builddir=dist-bindist ifeq "$(HADDOCK_DOCS)" "YES" - cd libraries/transformers && ./Setup haddock --builddir=dist-bindist + cd libraries/xhtml && ./Setup haddock --builddir=dist-bindist endif - cd libraries/transformers && ./Setup install --builddir=dist-bindist - cd libraries/transformers && ./Setup clean --builddir=dist-bindist - cd libraries/transformers && rm -f Setup Setup.exe Setup.hi Setup.o + cd libraries/xhtml && ./Setup install --builddir=dist-bindist + cd libraries/xhtml && ./Setup clean --builddir=dist-bindist + cd libraries/xhtml && rm -f Setup Setup.exe Setup.hi Setup.o # ----------------------------------------------------------------------------- # Numbered phase targets |