[commit: ghc] master: Undo fs*.h workaround (4e4a023)

[git at git.haskell.org]

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

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

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

commit 4e4a023f5f0595f54df8a0872a34506114df2423
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Apr 13 01:00:54 2018 +0100

    Undo fs*.h workaround
    
    See #554


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

4e4a023f5f0595f54df8a0872a34506114df2423
 src/Rules/Generate.hs | 5 -----
 src/Rules/Register.hs | 6 +-----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Rules/Generate.hs b/src/Rules/Generate.hs
index b57f547..cc2bf4b 100644
--- a/src/Rules/Generate.hs
+++ b/src/Rules/Generate.hs
@@ -167,11 +167,6 @@ copyRules = do
         prefix -/- "platformConstants" <~ (buildRoot <&> (-/- generatedDir))
         prefix -/- "settings"          <~ return "."
         prefix -/- "template-hsc.h"    <~ return (pkgPath hsc2hs)
-
-    -- TODO: Get rid of this workaround.
-    -- See https://github.com/snowleopard/hadrian/issues/554
-    root -/- buildDir rtsContext -/- "rts/fs.h"     <~ return "rts"
-    root -/- buildDir rtsContext -/- "rts/fs_rts.h" <~ return "rts"
   where
     infixl 1 <~
     pattern <~ mdir = pattern %> \file -> do
diff --git a/src/Rules/Register.hs b/src/Rules/Register.hs
index 8c726b5..ed0cb2b 100644
--- a/src/Rules/Register.hs
+++ b/src/Rules/Register.hs
@@ -65,11 +65,7 @@ buildConf _ context at Context {..} _conf = do
              , path -/- "ghcautoconf.h"
              , path -/- "ghcplatform.h"
              , path -/- "ghcversion.h"
-             , path -/- "ffi.h"
-             -- TODO: Get rid of this workaround.
-             -- See https://github.com/snowleopard/hadrian/issues/554
-             , path -/- "rts/fs.h"
-             , path -/- "rts/fs_rts.h" ]
+             , path -/- "ffi.h" ]
 
     when (package == integerGmp) $ need [path -/- "ghc-gmp.h"]