[Git][ghc/ghc][wip/javascript-backend] 2 commits: Revert useless change

[Sylvain Henry (@hsyl20)]

Sylvain Henry pushed to branch wip/javascript-backend at Glasgow Haskell Compiler / GHC


Commits:
d09671ed by Sylvain Henry at 2022-11-15T11:09:42+01:00
Revert useless change

- - - - -
5267d295 by Sylvain Henry at 2022-11-15T11:20:17+01:00
Always bundle libffi headers

- - - - -


2 changed files:

- hadrian/src/Rules/Generate.hs
- hadrian/src/Way/Type.hs


Changes:

=====================================
hadrian/src/Rules/Generate.hs
=====================================
@@ -42,7 +42,6 @@ rtsDependencies = do
     stage   <- getStage
     rtsPath <- expr (rtsBuildPath stage)
     jsTarget <- expr isJsTarget
-    useSystemFfi <- expr (flag UseSystemFfi)
 
     let -- headers common to native and JS RTS
         common_headers =
@@ -54,7 +53,7 @@ rtsDependencies = do
             [ "rts" -/- "EventTypes.h"
             , "rts" -/- "EventLogConstants.h"
             ]
-            ++ (if useSystemFfi then [] else libffiHeaderFiles)
+            ++ libffiHeaderFiles
         headers
           | jsTarget  = common_headers
           | otherwise = common_headers ++ native_headers


=====================================
hadrian/src/Way/Type.hs
=====================================
@@ -1,5 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE DerivingStrategies         #-}
+{-# LANGUAGE DerivingStrategies #-}
 module Way.Type where
 
 import Data.IntSet (IntSet)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fb6b71d1771df4e4ffd54a63ffaa0df2812a91ff...5267d295ec83591994b258a1f8fd13eb3fb5eae7

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/fb6b71d1771df4e4ffd54a63ffaa0df2812a91ff...5267d295ec83591994b258a1f8fd13eb3fb5eae7
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221115/f3828efd/attachment-0001.html>