[commit: ghc] wip/nfs-locking: Use `add-source` instead of linking cabal.sandbox.config (ea51eaa)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:20:26 UTC 2017


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

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

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

commit ea51eaad8e5b8eb64183fa169224ab2df61a63b9
Author: Kai Harries <kai.harries at gmail.com>
Date:   Sun Jul 24 15:17:56 2016 +0200

    Use `add-source` instead of linking cabal.sandbox.config
    
    As suggested by mpickering


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

ea51eaad8e5b8eb64183fa169224ab2df61a63b9
 build.cabal.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build.cabal.sh b/build.cabal.sh
index 3b6bef5..973cd3e 100755
--- a/build.cabal.sh
+++ b/build.cabal.sh
@@ -61,11 +61,7 @@ else
     # Initialize sandbox if necessary
     if ! ( "$CABAL" sandbox hc-pkg list > /dev/null 2>&1); then
         "$CABAL" sandbox init
-        ( cd ../libraries/Cabal/Cabal
-          ln -s "$absoluteRoot/cabal.sandbox.config" cabal.sandbox.config
-          "$CABAL" install
-          rm cabal.sandbox.config
-        )
+        "$CABAL" sandbox add-source ../libraries/Cabal/Cabal
         "$CABAL" install                \
             --dependencies-only         \
             --disable-library-profiling \



More information about the ghc-commits mailing list