[commit: ghc] master: [Semigroup] fix genapply (d7b260f)

git at git.haskell.org git at git.haskell.org
Sun Sep 24 07:19:14 UTC 2017


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

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

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

commit d7b260fef51564a1c87838df391d1367207d9e12
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Sat Sep 23 21:21:45 2017 +0800

    [Semigroup] fix genapply
    
    Summary:
    The SMP causes <> to be exported from Prelude by
    default.  When building HEAD with HEAD, genapply suffers from
    <> being imported from Prelude.
    
    Reviewers: hvr, bgamari, austin
    
    Reviewed By: hvr
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D4015


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

d7b260fef51564a1c87838df391d1367207d9e12
 utils/genapply/Main.hs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/utils/genapply/Main.hs b/utils/genapply/Main.hs
index 90ae5d7..9248c22 100644
--- a/utils/genapply/Main.hs
+++ b/utils/genapply/Main.hs
@@ -19,6 +19,10 @@ module Main(main) where
 -- Needed for TAG_BITS
 #include "../../includes/MachDeps.h"
 
+#if MIN_VERSION_base(4,11,0)
+import Prelude hiding ((<>))
+#endif
+
 import Text.PrettyPrint
 import Data.Word
 import Data.Bits



More information about the ghc-commits mailing list