Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/258c5310c7505ac0db5e1de95bf4c6d760bc793f >--------------------------------------------------------------- commit 258c5310c7505ac0db5e1de95bf4c6d760bc793f Author: Simon Peyton Jones <[email protected]> Date: Fri Jan 20 10:49:43 2012 +0000 Don't fail if "ar command" is not found >--------------------------------------------------------------- mk/ghc-config.hs | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mk/ghc-config.hs b/mk/ghc-config.hs index d2e9e7f..e0b8954 100644 --- a/mk/ghc-config.hs +++ b/mk/ghc-config.hs @@ -20,10 +20,16 @@ main = do getGhcField fields "GhcUnregisterised" "Unregisterised" getGhcField fields "GhcWithSMP" "Support SMP" getGhcField fields "GhcRTSWays" "RTS ways" - getGhcField fields "AR" "ar command" + getGhcFieldWithDefault fields "AR" "ar command" "ar" getGhcField :: [(String,String)] -> String -> String -> IO () -getGhcField fields mkvar key = do +getGhcField fields mkvar key = case lookup key fields of Nothing -> fail ("No field: " ++ key) Just val -> putStrLn (mkvar ++ '=':val) + +getGhcFieldWithDefault :: [(String,String)] -> String -> String -> String -> IO () +getGhcFieldWithDefault fields mkvar key deflt = do + case lookup key fields of + Nothing -> putStrLn (mkvar ++ '=':deflt) + Just val -> putStrLn (mkvar ++ '=':val) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
