[commit: ghc] wip/nfs-locking: Merge branch 'master' into fix_ffi_args (680766b)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/680766bbf029a391d4c4334648aa4739274cb25f/ghc

>---------------------------------------------------------------

commit 680766bbf029a391d4c4334648aa4739274cb25f
Merge: a3afd03 40b7920
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Mon Jan 18 12:49:15 2016 +0100

    Merge branch 'master' into fix_ffi_args
    
    Conflicts:
    	cfg/system.config.in



>---------------------------------------------------------------

680766bbf029a391d4c4334648aa4739274cb25f
 cfg/system.config.in     |  73 ++++++++++-----------------
 src/Builder.hs           | 126 ++++++++++++++++++++++++++---------------------
 src/GHC.hs               |  35 ++++++++++++-
 src/Rules/Generate.hs    |   6 ++-
 src/Settings.hs          |   5 +-
 src/Settings/Default.hs  |  34 +------------
 src/Settings/Packages.hs |   3 +-
 src/Settings/Paths.hs    |   5 +-
 src/Settings/User.hs     |  14 +-----
 9 files changed, 141 insertions(+), 160 deletions(-)