[commit: ghc] wip/nfs-locking: Fix ordering of appends. (95b6614)

[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/95b6614a659907ec33afce9bca396a7f7d20a498/ghc

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

commit 95b6614a659907ec33afce9bca396a7f7d20a498
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Jun 14 15:39:21 2015 +0100

    Fix ordering of appends.


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

95b6614a659907ec33afce9bca396a7f7d20a498
 src/Expression.hs | 2 +-
 src/Rules/Data.hs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Expression.hs b/src/Expression.hs
index ec76244..8ae285d 100644
--- a/src/Expression.hs
+++ b/src/Expression.hs
@@ -45,7 +45,7 @@ instance Monoid a => Monoid (Expr a) where
     mappend = liftM2 mappend
 
 append :: Monoid a => a -> DiffExpr a
-append x = return $ Endo (<> x)
+append = return . Endo . mappend
 
 appendM :: Monoid a => Action a -> DiffExpr a
 appendM mx = lift mx >>= append
diff --git a/src/Rules/Data.hs b/src/Rules/Data.hs
index c8cb354..4c7e5de 100644
--- a/src/Rules/Data.hs
+++ b/src/Rules/Data.hs
@@ -148,9 +148,9 @@ buildPackageData env ways settings =
     -- , "build" </> "autogen" </> ("Paths_" ++ name) <.> "hs"
     ] &%> \_ -> do
         let configure = pkgPath pkg </> "configure"
-        need [pkgPath pkg </> pkgCabal pkg]
         -- GhcCabal will run the configure script, so we depend on it
-        -- We still don't know who build the configure script from configure.ac
+        need [pkgPath pkg </> pkgCabal pkg]
+        -- We still don't know who built the configure script from configure.ac
         when (doesFileExist $ configure <.> "ac") $ need [configure]
         run' env GhcCabal settings
         -- TODO: when (registerPackage settings) $