summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
Diffstat (limited to 'compiler')
-rw-r--r--compiler/main/DynFlags.hs1
-rw-r--r--compiler/main/Packages.hs4
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index ffb5b33689..24746d6836 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1264,6 +1264,7 @@ allowed_combination way = and [ x `allowedWith` y
(WayCustom {}) `allowedWith` _ = True
WayThreaded `allowedWith` WayProf = True
WayThreaded `allowedWith` WayEventLog = True
+ WayProf `allowedWith` WayEventLog = True
_ `allowedWith` _ = False
mkBuildTag :: [Way] -> String
diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs
index 4710de1a20..ecec982422 100644
--- a/compiler/main/Packages.hs
+++ b/compiler/main/Packages.hs
@@ -1233,8 +1233,8 @@ packageHsLibs dflags p = map (mkDynName . addSuffix) (hsLibraries p)
-- the name of a shared library is libHSfoo-ghc<version>.so
-- we leave out the _dyn, because it is superfluous
- -- debug RTS includes support for -eventlog
- ways2 | WayDebug `elem` ways1
+ -- debug and profiled RTSs include support for -eventlog
+ ways2 | WayDebug `elem` ways1 || WayProf `elem` ways1
= filter (/= WayEventLog) ways1
| otherwise
= ways1