[commit: ghc] wip/nfs-locking: Add RTS args related to libffi (6abbbd0)

[git at git.haskell.org]

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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/6abbbd0696f55f8d6b7bcd33c4c4915f934b4045/ghc

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

commit 6abbbd0696f55f8d6b7bcd33c4c4915f934b4045
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Sep 25 22:27:47 2017 +0200

    Add RTS args related to libffi


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

6abbbd0696f55f8d6b7bcd33c4c4915f934b4045
 src/Settings/Packages/Rts.hs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Settings/Packages/Rts.hs b/src/Settings/Packages/Rts.hs
index 10940e4..c9d6359 100644
--- a/src/Settings/Packages/Rts.hs
+++ b/src/Settings/Packages/Rts.hs
@@ -38,15 +38,14 @@ rtsLibffiLibraryName = do
         (False, False) -> "Cffi"
         (_    , True ) -> "Cffi-6"
 
-rtsLibffiIncludeArgs :: Args
-rtsLibffiIncludeArgs = package libffi ? builder (Ghc CompileCWithGhc) ? do
-  useSystemFfi <- expr $ flag UseSystemFfi
-  ffiIncludeDir <- getSetting FfiIncludeDir
-  mconcat [
-    useSystemFfi ? pure (map ("-I" ++) $ words ffiIncludeDir),
-    -- ffi.h triggers prototype warnings, so disable them here:
-    inputs [ "//Interpreter.c", "//Storage.c", "//Adjustor.c" ] ?
-    arg "-Wno-strict-prototypes" ]
+rtsLibffiArgs :: Args
+rtsLibffiArgs = builder (Ghc CompileCWithGhc) ? do
+    useSystemFfi  <- expr $ flag UseSystemFfi
+    ffiIncludeDir <- getSetting FfiIncludeDir
+    mconcat [ useSystemFfi ? pure (map ("-I" ++) $ words ffiIncludeDir)
+            -- ffi.h triggers prototype warnings, so we disable them here
+            , inputs [ "//Interpreter.c", "//Storage.c", "//Adjustor.c" ] ?
+              arg "-Wno-strict-prototypes" ]
 
 rtsLibffiLibrary :: Way -> Action FilePath
 rtsLibffiLibrary way = do
@@ -195,7 +194,8 @@ rtsPackageArgs = package rts ? do
             , ghcRtsWithLibDw ? arg "-DUSE_LIBDW" ]
 
     mconcat
-        [ builder (Cc FindCDependencies) ? mconcat cArgs
+        [ rtsLibffiArgs
+        , builder (Cc FindCDependencies) ? mconcat cArgs
         , builder (Ghc CompileCWithGhc) ? mconcat (map (map ("-optc" ++) <$>) cArgs)
         , builder Ghc ? arg "-Irts"
         , builder HsCpp ? pure