X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverState.hs;h=a825926b0b07c1f943fbc92b4b108aae2bfa3933;hb=e74cd017fc700e503c8a0b0e94d8b8f9d8c92510;hp=ae738ff1057cf93f53bf1648fb74cc7a4ff4d773;hpb=71efe750343606d6d13fc8b8e77213fe13825288;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverState.hs b/ghc/compiler/main/DriverState.hs index ae738ff..a825926 100644 --- a/ghc/compiler/main/DriverState.hs +++ b/ghc/compiler/main/DriverState.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverState.hs,v 1.17 2000/12/04 16:42:14 rrt Exp $ +-- $Id: DriverState.hs,v 1.18 2000/12/05 12:09:43 sewardj Exp $ -- -- Settings for the driver -- @@ -553,8 +553,9 @@ data WayName GLOBAL_VAR(v_Ways, [] ,[WayName]) -allowed_combinations way = ways `elem` combs - where -- the sub-lists must be ordered according to WayName, because findBuildTag sorts them +allowed_combination way = way `elem` combs + where -- the sub-lists must be ordered according to WayName, + -- because findBuildTag sorts them combs = [ [WayProf,WayUnreg], [WayProf,WaySMP] ] findBuildTag :: IO [String] -- new options @@ -568,7 +569,7 @@ findBuildTag = do writeIORef v_Build_tag (wayTag details) return (wayOpts details) - ws -> if not allowed_combination ws + ws -> if not (allowed_combination ws) then throwDyn (OtherError $ "combination not supported: " ++ foldr1 (\a b -> a ++ '/':b)