[commit: ghc] wip/nfs-locking: Move ffiIncludeDir to C arguments (68446ab)

[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/68446abeab92087492baba6c746ab94c3bb7c2bb/ghc

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

commit 68446abeab92087492baba6c746ab94c3bb7c2bb
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Sep 26 20:56:28 2017 +0200

    Move ffiIncludeDir to C arguments


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

68446abeab92087492baba6c746ab94c3bb7c2bb
 src/Settings/Packages/Rts.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Settings/Packages/Rts.hs b/src/Settings/Packages/Rts.hs
index a7ed021..7282a0e 100644
--- a/src/Settings/Packages/Rts.hs
+++ b/src/Settings/Packages/Rts.hs
@@ -107,6 +107,7 @@ rtsPackageArgs = package rts ? do
     let cArgs = mconcat
           [ arg "-Irts"
           , arg $ "-I" ++ path
+          , flag UseSystemFfi ? arg ("-I" ++ ffiIncludeDir)
           , arg $ "-DRtsWay=\"rts_" ++ show way ++ "\""
           -- rts *must* be compiled with optimisations. The INLINE_HEADER macro
           -- requires that functions are inlined to work as expected. Inlining
@@ -181,9 +182,7 @@ rtsPackageArgs = package rts ? do
     mconcat
         [ builder (Cc FindCDependencies) ? cArgs
         , builder (Ghc CompileCWithGhc) ? map ("-optc" ++) <$> cArgs
-        , builder Ghc ? mconcat
-          [ arg "-Irts"
-          , flag UseSystemFfi ? arg ("-I" ++ ffiIncludeDir) ]
+        , builder Ghc ? arg "-Irts"
 
           , builder HsCpp ? pure
           [ "-DTOP="             ++ show top