[commit: hadrian] master: Make Cabal install unconditional in build.cabal.sh (#633) (bbdd69b)

git at git.haskell.org git at git.haskell.org
Thu Jul 26 21:36:24 UTC 2018


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

On branch  : master
Link       : http://git.haskell.org/hadrian.git/commitdiff/bbdd69bdaa48df99b90ffb95d1725abc72eae66b

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

commit bbdd69bdaa48df99b90ffb95d1725abc72eae66b
Author: Chitrak Raj Gupta <chitrak711988 at gmail.com>
Date:   Sat Jun 23 03:06:58 2018 +0530

    Make Cabal install unconditional in build.cabal.sh (#633)
    
    * adding include directories
    
    * Adding includes
    
    * Stable cabal sandbox build


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

bbdd69bdaa48df99b90ffb95d1725abc72eae66b
 build.cabal.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.cabal.sh b/build.cabal.sh
index d2bdb85..fe390af 100755
--- a/build.cabal.sh
+++ b/build.cabal.sh
@@ -61,12 +61,13 @@ else
     if ! ( "$CABAL" sandbox hc-pkg list > /dev/null 2>&1); then
         "$CABAL" sandbox init
         "$CABAL" sandbox add-source ../libraries/Cabal/Cabal
-        "$CABAL" install                \
-            --dependencies-only         \
-            --disable-library-profiling \
-            --disable-shared
     fi
 
+    "$CABAL" install                \
+	--dependencies-only         \
+	--disable-library-profiling \
+	--disable-shared
+
     "$CABAL" run hadrian --            \
         --lint                         \
         --directory "$absoluteRoot/.." \



More information about the ghc-commits mailing list