diff options
| -rwxr-xr-x | hadrian/build-cabal | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hadrian/build-cabal b/hadrian/build-cabal index 7d16f3e6b2..587566f780 100755 --- a/hadrian/build-cabal +++ b/hadrian/build-cabal @@ -2,7 +2,7 @@ CABAL="${CABAL:-cabal}" GHC="${GHC:-ghc}" -CABFLAGS=("--with-compiler=$GHC" "--disable-documentation" "--disable-profiling" "--disable-library-profiling" $CABFLAGS) +CABFLAGS=("--with-compiler=$GHC" "--disable-documentation" "--disable-profiling" "--disable-library-profiling" "-v2" $CABFLAGS) ( $GHC --info | grep -s '("Support SMP","YES")' > /dev/null ) || CABFLAGS+=("--constraint=hadrian -threaded") # It is currently more robust to pass Cabal an absolute path to the project file. @@ -23,6 +23,8 @@ fi CABVERSTR=$("$CABAL" --numeric-version) CABVER=( ${CABVERSTR//./ } ) +ls ~/.cabal/ + if [ "${CABVER[0]}" -gt 2 -o "${CABVER[0]}" -eq 2 -a "${CABVER[1]}" -ge 2 ]; then "$CABAL" --project-file="$PROJ" new-build "${CABFLAGS[@]}" -j exe:hadrian |