[commit: ghc] wip/nfs-locking: Remove a duplicate success message when building Lib0. (bfe72a5)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:14:51 UTC 2017


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

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

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

commit bfe72a5f9fa4aa31bf9e83ad690aef6b8741f8e6
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Dec 22 05:25:01 2015 +0000

    Remove a duplicate success message when building Lib0.


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

bfe72a5f9fa4aa31bf9e83ad690aef6b8741f8e6
 src/Rules/Library.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Rules/Library.hs b/src/Rules/Library.hs
index ff5ce63..12102c0 100644
--- a/src/Rules/Library.hs
+++ b/src/Rules/Library.hs
@@ -41,17 +41,17 @@ buildPackageLibrary _ target @ (PartialTarget stage pkg) = do
         let objs = cObjs ++ splitObjs ++ eObjs
 
         asuf <- libsuf way
-        if ("//*-0" <.> asuf) ?== a
+        let isLib0 = ("//*-0" <.> asuf) ?== a
+        if isLib0
         then build $ fullTarget target Ar [] [a] -- TODO: scan for dlls
         else build $ fullTarget target Ar objs [a]
 
         synopsis <- interpretPartial target $ getPkgData Synopsis
-        putSuccess $ renderBox
+        unless isLib0 . putSuccess $ renderBox
             [ "Successfully built package library '"
               ++ pkgName pkg
               ++ "' (" ++ show stage ++ ", way "++ show way ++ ")."
-            , "Package synopsis: " ++ dropWhileEnd isPunctuation synopsis ++ "."
-            ]
+            , "Package synopsis: " ++ dropWhileEnd isPunctuation synopsis ++ "." ]
 
     -- TODO: this looks fragile as haskell objects can match this rule if their
     -- names start with "HS" and they are on top of the module hierarchy.



More information about the ghc-commits mailing list