From: simonmar Date: Thu, 27 Jan 2005 14:38:29 +0000 (+0000) Subject: [project @ 2005-01-27 14:38:29 by simonmar] X-Git-Tag: Initial_conversion_from_CVS_complete~1170 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=2cf37ff932f52b68c73b0d6107d872b692a4cbf4;p=ghc-hetmet.git [project @ 2005-01-27 14:38:29 by simonmar] Fix explicit layout --- diff --git a/ghc/compiler/main/DriverMkDepend.hs b/ghc/compiler/main/DriverMkDepend.hs index 7d13a70..a303deb 100644 --- a/ghc/compiler/main/DriverMkDepend.hs +++ b/ghc/compiler/main/DriverMkDepend.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverMkDepend.hs,v 1.37 2005/01/27 10:44:27 simonpj Exp $ +-- $Id: DriverMkDepend.hs,v 1.38 2005/01/27 14:38:29 simonmar Exp $ -- -- GHC Driver -- @@ -273,13 +273,14 @@ insertSuffixes file_name extras endMkDependHS :: DynFlags -> MkDepFiles -> IO () -endMkDependHS dflags (MkDep { mkd_make_file = make_file, mkd_make_hdl = makefile_hdl, - mkd_tmp_file = tmp_file, mkd_tmp_hdl = tmp_hdl }) +endMkDependHS dflags + (MkDep { mkd_make_file = make_file, mkd_make_hdl = makefile_hdl, + mkd_tmp_file = tmp_file, mkd_tmp_hdl = tmp_hdl }) = do { -- write the magic marker into the tmp file hPutStrLn tmp_hdl depEndMarker - ; case makefile_hdl of - Nothing -> return () + ; case makefile_hdl of { + Nothing -> return (); Just hdl -> do { -- slurp the rest of the original makefile and copy it into the output @@ -302,7 +303,7 @@ endMkDependHS dflags (MkDep { mkd_make_file = make_file, mkd_make_hdl = makefil -- Copy the new makefile in place ; SysTools.copy dflags "Installing new makefile" tmp_file make_file - }} + }}} -----------------------------------------------------------------