From 8277f2dcff54748269c204c31b15f9ea55f9b6e2 Mon Sep 17 00:00:00 2001 From: "simonpj@microsoft.com" Date: Tue, 20 Oct 2009 15:52:01 +0000 Subject: [PATCH] Allow -ticky and -prof together The two used to be incompatible, but they aren't any longer. In fact, -ticky should not be a 'way' any more, and doing that is on Simon M's todo list, but this patch takes us a little step closer. I'm not sure this is worth merging to the 6.12 branch. --- compiler/main/StaticFlags.hs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index 2d3b3ad..3bcf28c 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -336,6 +336,11 @@ allowed_combination way = and [ x `allowedWith` y _ `allowedWith` WayDyn = True WayDyn `allowedWith` _ = True + -- ticky is (now) allowed with everything + -- Indeed, ticky should no longer be a 'way' at all + _ `allowedWith` WayTicky = True + WayTicky `allowedWith` _ = True + -- debug is allowed with everything _ `allowedWith` WayDebug = True WayDebug `allowedWith` _ = True -- 1.7.10.4