X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=53957e774485b85876c5d9aaab3d2d597f39e016;hp=ab2c8e8ccf240d2b11eaf08e48af322b84b2b8e2;hb=5ddee764beb312933256096d03df7c3ec47ac452;hpb=06decfcd62d1ca9069cd4707115ecb92bea39064 diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index ab2c8e8..53957e7 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -97,7 +97,7 @@ parseStaticFlags args = do when (not (null errs)) $ throwDyn (UsageError (unlines errs)) -- deal with the way flags: the way (eg. prof) gives rise to - -- futher flags, some of which might be static. + -- further flags, some of which might be static. way_flags <- findBuildTag -- if we're unregisterised, add some more flags @@ -489,7 +489,8 @@ findBuildTag :: IO [String] -- new options findBuildTag = do way_names <- readIORef v_Ways let ws = sort (nub way_names) - if not (allowed_combination ws) + res <- + if not (allowed_combination ws) then throwDyn (CmdLineError $ "combination not supported: " ++ foldr1 (\a b -> a ++ '/':b) @@ -503,6 +504,15 @@ findBuildTag = do writeIORef v_RTS_Build_tag rts_tag return (concat flags) + -- krc: horrible, I know. + (if opt_DoTickyProfiling then do + writeIORef v_RTS_Build_tag (mkBuildTag [(lkupWay WayTicky)]) + return (res ++ (wayOpts (lkupWay WayTicky))) + else + return res) + + + mkBuildTag :: [Way] -> String mkBuildTag ways = concat (intersperse "_" (map wayTag ways))