[commit: ghc] wip/nfs-locking: pass ffi include/library directories to HsCpp (39f0e7a)

[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/39f0e7a2fe46ea6e6fc1cc86685fd8729a4cf4c7/ghc

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

commit 39f0e7a2fe46ea6e6fc1cc86685fd8729a4cf4c7
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Mon Jan 18 20:06:55 2016 +0100

    pass ffi include/library directories to HsCpp


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

39f0e7a2fe46ea6e6fc1cc86685fd8729a4cf4c7
 src/Settings/Packages/Rts.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Settings/Packages/Rts.hs b/src/Settings/Packages/Rts.hs
index e684b7a..58b76cf 100644
--- a/src/Settings/Packages/Rts.hs
+++ b/src/Settings/Packages/Rts.hs
@@ -51,6 +51,8 @@ rtsPackageArgs = package rts ? do
     path           <- getTargetPath
     top            <- getTopDirectory
     libffiName     <- lift $ rtsLibffiLibraryName
+    ffiIncludeDir  <- getSetting FfiIncludeDir
+    ffiLibraryDir  <- getSetting FfiLibDir
     mconcat
         [ builderGcc ? mconcat
           [ arg "-Irts"
@@ -92,8 +94,8 @@ rtsPackageArgs = package rts ? do
 
         , builder HsCpp ? mconcat
           [ arg ("-DTOP=" ++ quote top)
-          , arg "-DFFI_INCLUDE_DIR="
-          , arg "-DFFI_LIB_DIR="
+          , arg ("-DFFI_INCLUDE_DIR=" ++ quote ffiIncludeDir)
+          , arg ("-DFFI_LIB_DIR=" ++ quote ffiLibraryDir)
           , arg $ "-DFFI_LIB=" ++ quote libffiName ] ]