summaryrefslogtreecommitdiff
path: root/compiler/GHC/HsToCore/Usage.hs
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-05-27 19:12:58 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-06-27 11:57:11 -0400
commita04020b88d4935d675f989806aff251f459561e9 (patch)
tree716aa06689f45af4fa922d89024062df60d65423 /compiler/GHC/HsToCore/Usage.hs
parenta74ec37c9d7679a5563ab86a8759c79c3c5de6f0 (diff)
downloadhaskell-a04020b88d4935d675f989806aff251f459561e9.tar.gz
DynFlags: don't store buildTag
`DynFlags.buildTag` was a field created from the set of Ways in `DynFlags.ways`. It had to be kept in sync with `DynFlags.ways` which was fragile. We want to avoid global state like this (#17957). Moreover in #14335 we also want to support loading units with different ways: target units would still use `DynFlags.ways` but plugins would use `GHC.Driver.Ways.hostFullWays`. To avoid having to deal both with build tag and with ways, we recompute the buildTag on-the-fly (should be pretty cheap) and we remove `DynFlags.buildTag` field.
Diffstat (limited to 'compiler/GHC/HsToCore/Usage.hs')
-rw-r--r--compiler/GHC/HsToCore/Usage.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/GHC/HsToCore/Usage.hs b/compiler/GHC/HsToCore/Usage.hs
index 567c84625e..0d9d8aabd6 100644
--- a/compiler/GHC/HsToCore/Usage.hs
+++ b/compiler/GHC/HsToCore/Usage.hs
@@ -186,7 +186,7 @@ mkPluginUsage hsc_env pluginModule
if useDyn
then libLocs
else
- let dflags' = updateWays (addWay' WayDyn dflags)
+ let dflags' = addWay' WayDyn dflags
dlibLocs = [ searchPath </> mkHsSOName platform dlibLoc
| searchPath <- searchPaths
, dlibLoc <- packageHsLibs dflags' pkg