summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2019-01-25 15:48:54 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-04-01 02:50:04 -0400
commit6c27fd3517e17813baef2cb0130ec50798ff6543 (patch)
treea19065b0491270c42fb1d3b68e0492928a1bb04b
parent463a4e4de71b6a3385bbe6b3f74f8eac43fb3d37 (diff)
downloadhaskell-cherry-pick-e7e5f4ae.tar.gz
Only build vanilla way in devel2 flavourcherry-pick-e7e5f4ae
Fixes #16210 (cherry picked from commit e7e5f4aebec2f095071a1949bb4595744754ee04)
-rw-r--r--hadrian/src/Settings/Flavours/Development.hs5
1 files changed, 4 insertions, 1 deletions
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