From: Simon Marlow <simonmar@microsoft.com>
Date: Mon, 23 Oct 2006 14:58:17 +0000 (+0000)
Subject: wibble in parseStaticFlags
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=da9b43e1c5d143bfcc5f6a669001e94cf7654a30

wibble in parseStaticFlags
should fix profiling and unreg in HEAD
---

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 54f5953..9378c0a 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -99,14 +99,17 @@ parseStaticFlags args = do
   let unreg_flags | cGhcUnregisterised == "YES" = unregFlags
 		  | otherwise = []
 
+  (more_leftover, errs) <- processArgs static_flags (unreg_flags ++ way_flags)
+
     -- TABLES_NEXT_TO_CODE affects the info table layout.
+    -- Be careful to do this *after* all processArgs,
+    -- because evaluating tablesNextToCode involves looking at the global
+    -- static flags.  Those pesky global variables...
   let cg_flags | tablesNextToCode = ["-optc-DTABLES_NEXT_TO_CODE"]
 	       | otherwise	  = []
 
-  (more_leftover, errs) <- processArgs static_flags 
-				(unreg_flags ++ cg_flags ++ way_flags)
   when (not (null errs)) $ ghcError (UsageError (unlines errs))
-  return (more_leftover++leftover)
+  return (cg_flags++more_leftover++leftover)
 
 
 -- note that ordering is important in the following list: any flag which