hadrian: Place non-Haskell objects last when linkingwip/T16685

In general Haskell objects will contain references to non-Haskell
objects, not the other way around. Consequently non-Haskell objects
should be placed last. This should fix #16685.

1 files changed, 4 insertions, 4 deletions

diff --git a/hadrian/src/Rules/Library.hs b/hadrian/src/Rules/Library.hs
index aea855df11..356af1f566 100644
--- a/hadrian/src/Rules/Library.hs
+++ b/hadrian/src/Rules/Library.hs
@@ -106,7 +106,7 @@ buildGhciLibO root ghcilibPath = do
 
 -- | Return all Haskell and non-Haskell object files for the given 'Context'.
 allObjects :: Context -> Action [FilePath]
-allObjects context = (++) <$> nonHsObjects context <*> hsObjects context
+allObjects context = (++) <$> hsObjects context <*> nonHsObjects context
 
 -- | Return all the non-Haskell object files for the given library context
 -- (object files built from C, C-- and sometimes other things).
@@ -139,10 +139,10 @@ extraObjects context
 -- the given 'Context'.
 libraryObjects :: Context -> Action [FilePath]
 libraryObjects context@Context{..} = do
-    hsObjs   <- hsObjects    context
     noHsObjs <- nonHsObjects context
-    need $ noHsObjs ++ hsObjs
-    return (noHsObjs ++ hsObjs)
+    hsObjs   <- hsObjects    context
+    need $ hsObjs ++ noHsObjs
+    return (hsObjs ++ noHsObjs)
 
 -- | Return extra library targets.
 extraTargets :: Context -> Action [FilePath]