[Git][ghc/ghc][wip/javascript-backend] 2 commits: Revert "Always bundle libffi headers"

[Sylvain Henry (@hsyl20)]

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


Commits:
494c6c73 by Sylvain Henry at 2022-11-15T14:06:40+01:00
Revert "Always bundle libffi headers"

This reverts commit 5267d295ec83591994b258a1f8fd13eb3fb5eae7.

- - - - -
10076a62 by Sylvain Henry at 2022-11-15T14:07:48+01:00
Don't always bundle ffi.h

- - - - -


2 changed files:

- hadrian/src/Rules/Generate.hs
- rts/rts.cabal.in


Changes:

=====================================
hadrian/src/Rules/Generate.hs
=====================================
@@ -42,6 +42,7 @@ 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 =
@@ -53,7 +54,7 @@ rtsDependencies = do
             [ "rts" -/- "EventTypes.h"
             , "rts" -/- "EventLogConstants.h"
             ]
-            ++ libffiHeaderFiles
+            ++ (if useSystemFfi then [] else libffiHeaderFiles)
         headers
           | jsTarget  = common_headers
           | otherwise = common_headers ++ native_headers


=====================================
rts/rts.cabal.in
=====================================
@@ -117,9 +117,10 @@ library
           extra-bundled-libraries: Cffi-6
         else
           extra-bundled-libraries: Cffi
-      install-includes: ffi.h ffitarget.h
-      -- ^ see Note [Packaging libffi headers] in
-      -- GHC.Driver.CodeOutput.
+
+        install-includes: ffi.h ffitarget.h
+        -- ^ see Note [Packaging libffi headers] in
+        -- GHC.Driver.CodeOutput.
 
       -- Here we declare several flavours to be available when passing the
       -- suitable (combination of) flag(s) when configuring the RTS from hadrian,



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5267d295ec83591994b258a1f8fd13eb3fb5eae7...10076a6237b48107166d4136b8e09d78028651af
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/1cdab948/attachment-0001.html>