[commit: ghc] wip/nfs-locking: Copy libffi into place (6d36942)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:22:54 UTC 2017


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

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

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

commit 6d369421eee990adb0f97e087dfc357fd7093262
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Mon Jan 4 20:27:15 2016 +0800

    Copy libffi into place
    
    rts needs libffi as libCff in rts/stage1/build. This fixes #89


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

6d369421eee990adb0f97e087dfc357fd7093262
 src/Rules/Copy.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Rules/Copy.hs b/src/Rules/Copy.hs
index 3f33d9c..bcd1f1e 100644
--- a/src/Rules/Copy.hs
+++ b/src/Rules/Copy.hs
@@ -21,7 +21,9 @@ copyRules = do
         when (length ffiHPaths /= 1) $
             putError $ "copyRules: exactly one ffi.h header expected"
                      ++ "(found: " ++ show ffiHPaths ++ ")."
+        
         copyFile (takeDirectory (head ffiHPaths) -/- takeFileName ffih) ffih
+        copyFile libffiLibrary (targetPath Stage1 rts -/- "build" -/- "libCffi.a")
 
     "inplace/lib/template-hsc.h"    <~ pkgPath hsc2hs
     "inplace/lib/platformConstants" <~ derivedConstantsPath



More information about the ghc-commits mailing list