[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (ed5ebee)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/ed5ebee4df62e438b7d7bcd32b672510c362206e >--------------------------------------------------------------- commit ed5ebee4df62e438b7d7bcd32b672510c362206e Merge: b9fccbc... 911bc5c... Author: Simon Peyton Jones <[email protected]> Date: Thu Oct 4 17:56:11 2012 +0100 Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc compiler/ghci/Linker.lhs | 7 - compiler/main/DriverPipeline.hs | 25 +++- compiler/main/DynFlags.hs | 299 +++++++++++++++++++-------------------- compiler/main/HscTypes.lhs | 12 ++ compiler/utils/Util.lhs | 12 ++ distrib/configure.ac.in | 2 +- driver/ghci/ghc.mk | 1 + ghc.mk | 76 ++++++---- ghc/ghc.mk | 3 + includes/ghc.mk | 5 + includes/mkDerivedConstants.c | 8 + mk/config.mk.in | 8 +- mk/validate-settings.mk | 7 +- mk/ways.mk | 39 +++-- rts/ghc.mk | 6 +- rts/package.conf.in | 2 +- rules/build-package.mk | 7 + rules/build-prog.mk | 44 +++++- rules/shell-wrapper.mk | 52 +++++--- utils/compare_sizes/ghc.mk | 1 + utils/genapply/ghc.mk | 1 + utils/genprimopcode/ghc.mk | 1 + utils/ghc-cabal/Main.hs | 134 ++++++++++++------ utils/ghc-cabal/ghc.mk | 1 + utils/ghc-pwd/ghc.mk | 2 + utils/ghctags/ghc.mk | 9 +- utils/hp2ps/ghc.mk | 15 +- utils/hpc/ghc.mk | 7 +- utils/mkUserGuidePart/ghc.mk | 9 +- utils/runghc/ghc.mk | 1 + utils/unlit/ghc.mk | 1 + 31 files changed, 490 insertions(+), 307 deletions(-)