[commit: ghc] wip/nfs-locking: Link gmp objects to integerGmp library (5b75d12)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 01:02:22 UTC 2017


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

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

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

commit 5b75d126eb0716e44be9be27dc4895a915d78a52
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu May 19 22:55:32 2016 +0100

    Link gmp objects to integerGmp library
    
    Fix #241


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

5b75d126eb0716e44be9be27dc4895a915d78a52
 src/Rules/Library.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Rules/Library.hs b/src/Rules/Library.hs
index 637dbaa..3fff65f 100644
--- a/src/Rules/Library.hs
+++ b/src/Rules/Library.hs
@@ -69,9 +69,10 @@ buildPackageGhciLibrary context at Context {..} = priority 2 $ do
 
             let cObjs = map (objFile context) cSrcs
                 hObjs = [ path -/- src <.> osuf way | src <- hSrcs ]
+                gObjs = [ gmpObjects -/- "*.o" | package == integerGmp ]
                 objs  = cObjs ++ hObjs
             need objs
-            build $ Target context Ld objs [obj]
+            build $ Target context Ld (objs ++ gObjs) [obj]
 
 -- TODO: Get rid of code duplication and simplify. See also src2dep.
 -- Given a 'Context' and a 'FilePath' to a source file, compute the 'FilePath'



More information about the ghc-commits mailing list