summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2022-11-09 13:27:59 +0100
committerSylvain Henry <sylvain@haskus.fr>2022-11-09 13:27:59 +0100
commit7bf1e700894f60859bc37beac8a010da35cd52e6 (patch)
tree520461901e12da57da4cbece2ab9bdb320c3b2f0
parent257c81757ac9d263158ee4be6577be1e9829ead6 (diff)
downloadhaskell-7bf1e700894f60859bc37beac8a010da35cd52e6.tar.gz
Hadrian: tweak validate flavour to avoid building threaded
-rw-r--r--hadrian/src/Settings/Flavours/Validate.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/hadrian/src/Settings/Flavours/Validate.hs b/hadrian/src/Settings/Flavours/Validate.hs
index 7ecc97cf37..aac3e2dcfc 100644
--- a/hadrian/src/Settings/Flavours/Validate.hs
+++ b/hadrian/src/Settings/Flavours/Validate.hs
@@ -18,9 +18,11 @@ validateFlavour = enableLinting $ werror $ defaultFlavour
, notStage0 ? platformSupportsSharedLibs ? pure [dynamic]
]
, rtsWays = Set.fromList <$>
- mconcat [ pure [vanilla, threaded, debug, threadedDebug]
- , notStage0 ? platformSupportsSharedLibs ? pure
- [ dynamic, threadedDynamic, debugDynamic, threadedDebugDynamic
+ mconcat [ pure [vanilla, debug]
+ , targetSupportsSMP ? pure [threaded, threadedDebug]
+ , notStage0 ? platformSupportsSharedLibs ? mconcat
+ [ pure [ dynamic, debugDynamic ]
+ , targetSupportsSMP ? pure [ threadedDynamic, threadedDebugDynamic ]
]
]
, ghcDebugAssertions = (<= Stage1)