[commit: ghc] wip/nfs-locking: Merge Base.hs and Util.hs. (190f3fd)

[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/190f3fde35a3230bbdfe50afce81dd5e10590c24/ghc

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

commit 190f3fde35a3230bbdfe50afce81dd5e10590c24
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Aug 22 21:03:38 2015 +0100

    Merge Base.hs and Util.hs.


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

190f3fde35a3230bbdfe50afce81dd5e10590c24
 src/Base.hs                       | 119 +++++++++++++++++++++++++++++++++++++-
 src/Builder.hs                    |   1 -
 src/Expression.hs                 |   3 +-
 src/Oracles/ArgsHash.hs           |   2 -
 src/Oracles/Config.hs             |   1 -
 src/Oracles/Config/Flag.hs        |   1 -
 src/Oracles/Dependencies.hs       |   1 -
 src/Oracles/PackageData.hs        |   1 -
 src/Oracles/PackageDeps.hs        |   1 -
 src/Oracles/WindowsRoot.hs        |   1 -
 src/Package.hs                    |   1 -
 src/Predicates.hs                 |   1 -
 src/Rules.hs                      |   6 +-
 src/Rules/Actions.hs              |   3 -
 src/Rules/Cabal.hs                |   1 -
 src/Rules/Compile.hs              |   1 -
 src/Rules/Config.hs               |   1 -
 src/Rules/Data.hs                 |   2 -
 src/Rules/Dependencies.hs         |   2 -
 src/Rules/Documentation.hs        |   1 -
 src/Rules/Library.hs              |   7 +--
 src/Rules/Package.hs              |   1 -
 src/Rules/Resources.hs            |   1 -
 src/Settings/Args.hs              |   2 +-
 src/Settings/Builders/Gcc.hs      |   2 -
 src/Settings/Builders/Ghc.hs      |   1 -
 src/Settings/Builders/GhcCabal.hs |   2 -
 src/Settings/Builders/GhcPkg.hs   |   1 -
 src/Settings/Builders/Haddock.hs  |   2 -
 src/Settings/TargetDirectory.hs   |   1 -
 src/Settings/Util.hs              |   1 -
 src/Settings/Ways.hs              |   1 -
 src/Target.hs                     |   1 -
 src/Util.hs                       | 117 -------------------------------------
 src/Way.hs                        |   3 +-
 35 files changed, 124 insertions(+), 169 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 190f3fde35a3230bbdfe50afce81dd5e10590c24