Undo fs*.h workaround
authorAndrey Mokhov <andrey.mokhov@gmail.com>
Fri, 13 Apr 2018 00:00:54 +0000 (01:00 +0100)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Fri, 13 Apr 2018 00:00:54 +0000 (01:00 +0100)
See #554

src/Rules/Generate.hs
src/Rules/Register.hs

index b57f547..cc2bf4b 100644 (file)
@@ -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
index 8c726b5..ed0cb2b 100644 (file)
@@ -65,11 +65,7 @@ buildConf _ context@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"]