diff --git a/hadrian/src/Flavour.hs b/hadrian/src/Flavour.hs index 84fefcae00a8fa23b791f645c1508798d0d62e65..3a43e2e542c35c595c4de351dce52789be783b46 100644 --- a/hadrian/src/Flavour.hs +++ b/hadrian/src/Flavour.hs @@ -199,7 +199,7 @@ viaLlvmBackend = addArgs $ notStage0 ? builder Ghc ? arg "-fllvm" -- dynamically-linker. enableProfiledGhc :: Flavour -> Flavour enableProfiledGhc flavour = - enableLateCCS flavour { rtsWays = do + flavour { rtsWays = do ws <- rtsWays flavour pure $ (Set.map (\w -> if wayUnit Dynamic w then w else w <> profiling) ws) <> ws , libraryWays = (Set.singleton profiling <>) <$> (libraryWays flavour) @@ -521,4 +521,3 @@ builderSetting = stages = map (\stg -> (stageString stg, stg)) allStages pkgs = map (\pkg -> (pkgName pkg, pkg)) (ghcPackages ++ userPackages) - diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index aa61147ccda570898b281dcf8cbd329203f24c9c..dafea4c436ed780bcdc73eb6b0c80a783dda70b2 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -54,7 +54,7 @@ packageArgs = do , builder (Ghc CompileHs) ? mconcat [ debugAssertions ? notStage0 ? arg "-DDEBUG" - , inputs ["**/GHC.hs", "**/GHC/Driver/Make.hs"] ? arg "-fprof-auto" + -- , inputs ["**/GHC.hs", "**/GHC/Driver/Make.hs"] ? arg "-fprof-auto" , input "**/Parser.hs" ? pure ["-fno-ignore-interface-pragmas", "-fcmm-sink"] -- Enable -haddock and -Winvalid-haddock for the compiler