From af3d3818c88e0d5e679681a0e819b4a75570c4fa Mon Sep 17 00:00:00 2001 From: Brent Yorgey Date: Wed, 21 Mar 2018 22:22:58 -0500 Subject: [PATCH] Revert "remove unnecessary profiling flag" This reverts commit d065038c8a07a132d04904089e3970bb193c8e48. Put profiling flag back, and comment out 'cabal check' test in .travis.yml --- .travis.yml | 5 +++-- xmonad.cabal | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 916ef88..4b8b340 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,8 +100,9 @@ script: - cabal new-build -w ${HC} ${TEST} ${BENCH} all - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi - # cabal check - - (cd xmonad-* && cabal check) + # We don't do cabal check because it is unhappy about a convenience flag for + # building with profiling. + # - (cd xmonad-* && cabal check) # haddock - rm -rf ./dist-newstyle diff --git a/xmonad.cabal b/xmonad.cabal index 314048d..e780ae8 100644 --- a/xmonad.cabal +++ b/xmonad.cabal @@ -52,6 +52,11 @@ flag generatemanpage default: False manual: True +flag profiling + description: Enable profiling + default: False + manual: True + library hs-source-dirs: src exposed-modules: XMonad @@ -87,6 +92,10 @@ library extensions: UndecidableInstances -- needed for XMonad.Config's instance Default (XConfig a) + + if flag(profiling) + ghc-prof-options: -prof -auto-all + if flag(testing) buildable: False