diff options
author | Joachim Breitner <mail@joachim-breitner.de> | 2015-08-16 00:03:02 +0200 |
---|---|---|
committer | Joachim Breitner <mail@joachim-breitner.de> | 2015-08-16 00:04:50 +0200 |
commit | 5ee5ff824971507b8cceed9f9c343be45238d51e (patch) | |
tree | a5c6241bf32670816701f4931c6269badd20edce /Dh_Haskell.sh | |
parent | 7c8efb37c68cb41049b8b18efc07c00821b6bac4 (diff) |
Compile Setup.hs with -threaded, to unbreak testsuites on GHC 7.10 See https://github.com/haskell/cabal/issues/2398
Diffstat (limited to 'Dh_Haskell.sh')
-rw-r--r-- | Dh_Haskell.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Dh_Haskell.sh b/Dh_Haskell.sh index eba8c30..ab61a10 100644 --- a/Dh_Haskell.sh +++ b/Dh_Haskell.sh @@ -364,7 +364,19 @@ clean_recipe(){ make_setup_recipe(){ # local PS5=$PS4; PS4=" + make_setup_recipe> "; set -x - for setup in Setup.lhs Setup.hs; do if test -e $setup; then run ghc --make $setup -o ${DEB_SETUP_BIN_NAME}; exit 0; fi; done + # https://github.com/haskell/cabal/issues/2398 + if [ "$GHC_HAS_SMP" = "yes" ] + then + threaded="-threaded" + fi + for setup in Setup.lhs Setup.hs + do + if test -e $setup + then + run ghc --make $setup $threaded -o ${DEB_SETUP_BIN_NAME} + exit 0 + fi + done # PS4=$PS5 } |