[commit: ghc] master: Merge commit '5229c43ccf77bcbffeced01dccb27398d017fa34' (506ba62)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/506ba623fd20bfc30794c06d83d1387e3a6bdb8b/ghc

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

commit 506ba623fd20bfc30794c06d83d1387e3a6bdb8b
Merge: f8e7fec 5229c43
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Nov 10 09:28:36 2017 -0500

    Merge commit '5229c43ccf77bcbffeced01dccb27398d017fa34'



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

506ba623fd20bfc30794c06d83d1387e3a6bdb8b
 hadrian/cfg/system.config.in             | 3 ---
 hadrian/src/Oracles/Flag.hs              | 6 ------
 hadrian/src/Settings/Builders/Common.hs  | 7 +++----
 hadrian/src/Settings/Packages/GhcPrim.hs | 1 -
 hadrian/src/Settings/Packages/Rts.hs     | 4 ++--
 hadrian/src/Settings/Warnings.hs         | 5 ++---
 6 files changed, 7 insertions(+), 19 deletions(-)