[commit: ghc] wip/nfs-locking: build.cabal.sh: Use cabal new-run (#435) (6942b2d)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 01:29:23 UTC 2017


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

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

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

commit 6942b2dc08832f1521e2e8c46993c5ab977d2cb7
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Oct 12 18:17:50 2017 -0400

    build.cabal.sh: Use cabal new-run (#435)
    
    The previous approach was terribly unreliable, leading me to waste an hour
    debugging #425.


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

6942b2dc08832f1521e2e8c46993c5ab977d2cb7
 build.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 2a0e8a7..5d1c2c2 100755
--- a/build.sh
+++ b/build.sh
@@ -46,9 +46,8 @@ if [ "${CABVER[0]}" -eq 2 -o "${CABVER[0]}" -eq 1 -a "${CABVER[1]}" -ge 24 ]; th
     # New enough cabal version detected, so
     # let's use the superior 'cabal new-build' mode
 
-    # there's no 'cabal new-run' yet, but it's easy to emulate
     "$CABAL" new-build --disable-profiling --disable-documentation -j exe:hadrian
-    $(find ./dist-newstyle -type f -name hadrian | head -n 1) \
+    "$CABAL" new-run -- hadrian        \
         --lint                         \
         --directory "$absoluteRoot/.." \
         "$@"



More information about the ghc-commits mailing list