[commit: ghc] wip/nfs-locking: Pass GMP objects to Ld explicitly (aaead2a)

[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/aaead2a5caa9fa96cc8a9f8a2762582bec70126f/ghc

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

commit aaead2a5caa9fa96cc8a9f8a2762582bec70126f
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri May 20 00:23:50 2016 +0100

    Pass GMP objects to Ld explicitly
    
    See #241.


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

aaead2a5caa9fa96cc8a9f8a2762582bec70126f
 src/Rules/Library.hs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Rules/Library.hs b/src/Rules/Library.hs
index a198c64..2e59755 100644
--- a/src/Rules/Library.hs
+++ b/src/Rules/Library.hs
@@ -67,13 +67,12 @@ buildPackageGhciLibrary context at Context {..} = priority 2 $ do
             cSrcs <- cSources context
             hSrcs <- hSources context
 
+            eObjs <- extraObjects context
             let cObjs = map (objFile context) cSrcs
                 hObjs = [ path -/- src <.> osuf way | src <- hSrcs ]
-                gObjs = [ gmpObjects -/- "*.o" | package == integerGmp ]
-                objs  = cObjs ++ hObjs
-            when (package == integerGmp) $ orderOnly [gmpLibraryH]
+                objs  = cObjs ++ hObjs ++ eObjs
             need objs
-            build $ Target context Ld (objs ++ gObjs) [obj]
+            build $ Target context Ld objs [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'