diff options
| author | Ben Gamari <ben@well-typed.com> | 2019-01-30 01:06:12 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@well-typed.com> | 2019-01-30 01:06:12 -0500 |
| commit | 76c8fd674435a652c75a96c85abbf26f1f221876 (patch) | |
| tree | b02a6f5307a20efc25ddb27c58977069b48972b6 /hadrian | |
| parent | 7cdcd3e12a5c3a337e36fa80c64bd72e5ef79b24 (diff) | |
| download | haskell-76c8fd674435a652c75a96c85abbf26f1f221876.tar.gz | |
Batch merge
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/build.cabal.bat | 2 | ||||
| -rwxr-xr-x | hadrian/build.cabal.sh | 2 | ||||
| -rw-r--r-- | hadrian/src/Settings/Flavours/Development.hs | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/hadrian/build.cabal.bat b/hadrian/build.cabal.bat index 3344791bc8..aa0acab4e4 100644 --- a/hadrian/build.cabal.bat +++ b/hadrian/build.cabal.bat @@ -1,6 +1,6 @@ @echo off set CABAL=cabal -set CABFLAGS=--disable-documentation --disable-profiling +set CABFLAGS=--disable-documentation --disable-profiling --disable-library-profiling rem It is currently more robust to pass Cabal an absolute path to the project file. set PROJ="%CD%/hadrian/cabal.project" diff --git a/hadrian/build.cabal.sh b/hadrian/build.cabal.sh index f28c3e0d14..13ef927f8e 100755 --- a/hadrian/build.cabal.sh +++ b/hadrian/build.cabal.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash CABAL=cabal -CABFLAGS="--disable-documentation --disable-profiling" +CABFLAGS="--disable-documentation --disable-profiling --disable-library-profiling" # It is currently more robust to pass Cabal an absolute path to the project file. PROJ="$PWD/hadrian/cabal.project" diff --git a/hadrian/src/Settings/Flavours/Development.hs b/hadrian/src/Settings/Flavours/Development.hs index 5919026cb0..9ad4b6b365 100644 --- a/hadrian/src/Settings/Flavours/Development.hs +++ b/hadrian/src/Settings/Flavours/Development.hs @@ -8,7 +8,10 @@ import {-# SOURCE #-} Settings.Default developmentFlavour :: Stage -> Flavour developmentFlavour ghcStage = defaultFlavour { name = "devel" ++ show (fromEnum ghcStage) - , args = defaultBuilderArgs <> developmentArgs ghcStage <> defaultPackageArgs } + , args = defaultBuilderArgs <> developmentArgs ghcStage <> defaultPackageArgs + , libraryWays = pure [vanilla] + , rtsWays = pure [vanilla, threaded] + , dynamicGhcPrograms = return False } developmentArgs :: Stage -> Args developmentArgs ghcStage = do |