[commit: ghc] wip/nfs-locking: Merge branch 'master' into angerman/feature/build-info-flags (8dfe2b9)

[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/8dfe2b928d8e2d8eef9f45fb148764799e844257/ghc

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

commit 8dfe2b928d8e2d8eef9f45fb148764799e844257
Merge: 5d4e182 27f303f
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Tue Jan 12 14:57:35 2016 +0800

    Merge branch 'master' into angerman/feature/build-info-flags
    
    # Conflicts:
    #	src/Main.hs



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

8dfe2b928d8e2d8eef9f45fb148764799e844257
 .appveyor.yml                            | 10 +++++++++-
 .travis.yml                              |  3 ++-
 shaking-up-ghc.cabal                     |  3 +++
 src/Main.hs                              |  7 ++++++-
 src/Rules/Generate.hs                    |  9 ++++++---
 src/Settings/Builders/Ar.hs              | 16 ++++------------
 src/Settings/Builders/DeriveConstants.hs | 14 +++++---------
 src/Test.hs                              | 28 ++++++++++++++++++++++++++++
 src/Way.hs                               |  2 +-
 9 files changed, 64 insertions(+), 28 deletions(-)

diff --cc src/Main.hs
index f65483d,dea793e..6d79cb8
--- a/src/Main.hs
+++ b/src/Main.hs
@@@ -11,15 -11,11 +11,19 @@@ import qualified Rules.Gm
  import qualified Rules.Libffi
  import qualified Rules.Oracles
  import qualified Rules.Perl
++<<<<<<< HEAD
 +import Oracles.Config.CmdLineFlag (cmdLineOracle, flags)
++=======
+ import qualified Test
++>>>>>>> master
  
  main :: IO ()
 -main = shakeArgs options rules
 +main = shakeArgsWith options flags $ \cmdLineFlags targets ->
 +    return . Just $ cmdLineOracle cmdLineFlags
 +        >> if null targets then rules else want targets
 +        >> withoutActions rules
    where
 +    rules :: Rules ()
      rules = mconcat
          [ Rules.Cabal.cabalRules
          , Rules.Config.configRules