[commit: ghc] master: A little polishing (e8459fd)

Ian Lynagh igloo at earth.li
Sun Mar 17 01:51:06 CET 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/e8459fd63bd47b0f7c81ae6a9155543d2c5916c4

>---------------------------------------------------------------

commit e8459fd63bd47b0f7c81ae6a9155543d2c5916c4
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sat Mar 16 19:15:05 2013 +0000

    A little polishing

>---------------------------------------------------------------

 compiler/ghci/Linker.lhs  | 2 +-
 compiler/main/DynFlags.hs | 6 ++++++
 ghc/Main.hs               | 5 -----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index 3d568ea..9d16a12 100644
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -640,7 +640,7 @@ getLinkDeps hsc_env hpt pls replace_osuf span mods
                 -- When looking for dynamic object files, we try both
                 -- .dyn_o and .o, with a preference for the former.
                 use_dyn <- if cDYNAMIC_GHC_PROGRAMS
-                           then do doesFileExist dyn_file
+                           then doesFileExist dyn_file
                            else return False
                 if use_dyn
                     then return (DotO dyn_file)
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 74546e3..80c5f34 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -74,6 +74,7 @@ module DynFlags (
         -- ** Manipulating DynFlags
         defaultDynFlags,                -- Settings -> DynFlags
         defaultWays,
+        interpWays,
         initDynFlags,                   -- DynFlags -> IO DynFlags
         defaultFatalMessager,
         defaultLogAction,
@@ -1337,6 +1338,11 @@ defaultWays settings = if pc_DYNAMIC_BY_DEFAULT (sPlatformConstants settings)
                        then [WayDyn]
                        else []
 
+interpWays :: [Way]
+interpWays = if cDYNAMIC_GHC_PROGRAMS
+             then [WayDyn]
+             else []
+
 --------------------------------------------------------------------------
 
 type FatalMessager = String -> IO ()
diff --git a/ghc/Main.hs b/ghc/Main.hs
index cd7f5c4..f17f403 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -234,11 +234,6 @@ ghciUI _ _ = throwGhcException (CmdLineError "not built for interactive use")
 ghciUI     = interactiveUI defaultGhciSettings
 #endif
 
-interpWays :: [Way]
-interpWays = if cDYNAMIC_GHC_PROGRAMS
-             then [WayDyn]
-             else []
-
 -- -----------------------------------------------------------------------------
 -- Splitting arguments into source files and object files.  This is where we
 -- interpret the -x <suffix> option, and attach a (Maybe Phase) to each source





More information about the ghc-commits mailing list