[commit: ghc] wip/nfs-locking: Merge pull request #36 from bgamari/reexport (84af166)

[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/84af1661707ed82d1b378d02ce712ecc212535f5/ghc

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

commit 84af1661707ed82d1b378d02ce712ecc212535f5
Merge: 58d7fcc 30484e2
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Dec 28 13:09:27 2015 +0000

    Merge pull request #36 from bgamari/reexport
    
    Begin paring down reexports



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

84af1661707ed82d1b378d02ce712ecc212535f5
 src/Base.hs                              | 11 ++---------
 src/Builder.hs                           | 19 +++++++++++--------
 src/Expression.hs                        |  3 ++-
 src/Oracles/ArgsHash.hs                  |  1 +
 src/Oracles/Config.hs                    |  1 +
 src/Oracles/Config/Flag.hs               |  2 ++
 src/Oracles/Config/Setting.hs            |  2 ++
 src/Oracles/PackageData.hs               |  1 +
 src/Oracles/WindowsRoot.hs               |  1 +
 src/Predicates.hs                        |  6 ++----
 src/Rules.hs                             |  1 +
 src/Rules/Actions.hs                     |  1 +
 src/Rules/Cabal.hs                       |  1 +
 src/Rules/Compile.hs                     |  1 +
 src/Rules/Data.hs                        |  1 +
 src/Rules/Dependencies.hs                |  2 ++
 src/Rules/Documentation.hs               |  1 +
 src/Rules/Generate.hs                    |  1 +
 src/Rules/Generators/ConfigHs.hs         |  1 +
 src/Rules/Generators/GhcAutoconfH.hs     |  1 +
 src/Rules/Generators/GhcBootPlatformH.hs |  1 +
 src/Rules/Generators/GhcPlatformH.hs     |  1 +
 src/Rules/Generators/VersionHs.hs        |  1 +
 src/Rules/Install.hs                     |  1 +
 src/Rules/Library.hs                     |  5 ++++-
 src/Rules/Program.hs                     |  3 +++
 src/Settings.hs                          |  7 ++++---
 src/Settings/Args.hs                     |  2 ++
 src/Settings/Builders/Ar.hs              |  1 +
 src/Settings/Builders/DeriveConstants.hs |  1 +
 src/Settings/Builders/Gcc.hs             |  2 ++
 src/Settings/Builders/Ghc.hs             |  1 +
 src/Settings/Builders/GhcCabal.hs        |  8 ++++++++
 src/Settings/Builders/GhcPkg.hs          |  2 ++
 src/Settings/Builders/Haddock.hs         |  4 ++++
 src/Settings/Builders/Hsc2Hs.hs          |  4 ++++
 src/Settings/Packages.hs                 |  3 +++
 src/Settings/TargetDirectory.hs          |  1 +
 src/Settings/User.hs                     |  2 +-
 src/Settings/Ways.hs                     |  2 ++
 src/Target.hs                            |  2 ++
 41 files changed, 85 insertions(+), 27 deletions(-)