diff options
Diffstat (limited to 'compiler/GHC/Linker/Windows.hs')
| -rw-r--r-- | compiler/GHC/Linker/Windows.hs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/compiler/GHC/Linker/Windows.hs b/compiler/GHC/Linker/Windows.hs index 3bbe83f10e..8e1f60d2c6 100644 --- a/compiler/GHC/Linker/Windows.hs +++ b/compiler/GHC/Linker/Windows.hs @@ -7,15 +7,17 @@ import GHC.Prelude import GHC.SysTools import GHC.Driver.Session import GHC.SysTools.FileCleanup +import GHC.Utils.Logger import System.FilePath import System.Directory maybeCreateManifest - :: DynFlags + :: Logger + -> DynFlags -> FilePath -- ^ filename of executable -> IO [FilePath] -- ^ extra objects to embed, maybe -maybeCreateManifest dflags exe_filename = do +maybeCreateManifest logger dflags exe_filename = do let manifest_filename = exe_filename <.> "manifest" manifest = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n\ @@ -42,9 +44,9 @@ maybeCreateManifest dflags exe_filename = do if not (gopt Opt_EmbedManifest dflags) then return [] else do - rc_filename <- newTempName dflags TFL_CurrentModule "rc" + rc_filename <- newTempName logger dflags TFL_CurrentModule "rc" rc_obj_filename <- - newTempName dflags TFL_GhcSession (objectSuf dflags) + newTempName logger dflags TFL_GhcSession (objectSuf dflags) writeFile rc_filename $ "1 24 MOVEABLE PURE " ++ show manifest_filename ++ "\n" @@ -52,7 +54,7 @@ maybeCreateManifest dflags exe_filename = do -- show is a bit hackish above, but we need to escape the -- backslashes in the path. - runWindres dflags $ map GHC.SysTools.Option $ + runWindres logger dflags $ map GHC.SysTools.Option $ ["--input="++rc_filename, "--output="++rc_obj_filename, "--output-format=coff"] |