From: simonpj@microsoft.com <unknown>
Date: Tue, 20 Oct 2009 15:52:01 +0000 (+0000)
Subject: Allow -ticky and -prof together
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=8277f2dcff54748269c204c31b15f9ea55f9b6e2

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.
---

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