Navigation Menu

Skip to content

Commit

Permalink
Compile Setup.hs with -threaded, to unbreak testsuites on GHC 7.10 See
Browse files Browse the repository at this point in the history
  • Loading branch information
nomeata committed Aug 15, 2015
1 parent 7c8efb3 commit 5ee5ff8
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
14 changes: 13 additions & 1 deletion Dh_Haskell.sh
Expand Up @@ -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
}

Expand Down
7 changes: 7 additions & 0 deletions debian/changelog
@@ -1,3 +1,10 @@
haskell-devscripts (0.9.12) UNRELEASED; urgency=medium

* Compile Setup.hs with -threaded, to unbreak testsuites on GHC 7.10
See https://github.com/haskell/cabal/issues/2398

-- Joachim Breitner <nomeata@debian.org> Sun, 16 Aug 2015 00:02:29 +0200

haskell-devscripts (0.9.11) unstable; urgency=medium

[ Chris Lamb ]
Expand Down
1 change: 1 addition & 0 deletions hlibrary.mk
Expand Up @@ -128,6 +128,7 @@ export DEB_GHC_EXTRA_PACKAGES
export DEB_LINTIAN_OVERRIDES_FILE
export DEB_ENABLE_HOOGLE
export MAKEFILE
export GHC_HAS_SMP

clean::
. /usr/share/haskell-devscripts/Dh_Haskell.sh && \
Expand Down

0 comments on commit 5ee5ff8

Please sign in to comment.