[commit: ghc] master: Fix a logic error that kept us from building/linking object files for many ways (#687) (9609113)

git at git.haskell.org git at git.haskell.org
Tue Oct 23 20:20:29 UTC 2018


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9609113f1d54e043c29f0fb6f1172509e7a66a84/ghc

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

commit 9609113f1d54e043c29f0fb6f1172509e7a66a84
Author: Alp Mestanogullari <alpmestan at gmail.com>
Date:   Wed Sep 12 23:13:50 2018 +0200

    Fix a logic error that kept us from building/linking object files for many ways (#687)


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

9609113f1d54e043c29f0fb6f1172509e7a66a84
 src/Rules/Library.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Rules/Library.hs b/src/Rules/Library.hs
index 49a7d22..13f2ea3 100644
--- a/src/Rules/Library.hs
+++ b/src/Rules/Library.hs
@@ -92,7 +92,7 @@ cObjects :: Context -> Action [FilePath]
 cObjects context = do
     srcs <- interpretInContext context (getPackageData PD.cSrcs)
     objs <- mapM (objectPath context) srcs
-    return $ if way context == threaded
+    return $ if Threaded `wayUnit` way context
         then objs
         else filter ((`notElem` ["Evac_thr", "Scav_thr"]) . takeBaseName) objs
 



More information about the ghc-commits mailing list