X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FSysTools.lhs;h=a4222a7577bc56f61b518027b679c883674369ba;hp=e098dd9eabce8cf301e895694ebe4014d38f95b5;hb=17b297d97d327620ed6bfab942f8992b2446f1bf;hpb=2ebe8addfaae2bc65e6b87ad369928b02053014f

diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs
index e098dd9..a4222a7 100644
--- a/compiler/main/SysTools.lhs
+++ b/compiler/main/SysTools.lhs
@@ -7,6 +7,13 @@
 -----------------------------------------------------------------------------
 
 \begin{code}
+{-# OPTIONS_GHC -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+-- for details
+
 module SysTools (
 	-- Initialisation
 	initSysTools,
@@ -17,6 +24,7 @@ module SysTools (
 	runMangle, runSplit,	 -- [Option] -> IO ()
 	runAs, runLink,		 -- [Option] -> IO ()
 	runMkDLL,
+        runWindres,
 
 	touch,			-- String -> String -> IO ()
 	copy,
@@ -196,6 +204,10 @@ initSysTools mbMinusB dflags
 		| am_installed = installed_bin cGHC_MANGLER_PGM
 		| otherwise    = inplace cGHC_MANGLER_DIR_REL cGHC_MANGLER_PGM
 
+              windres_path
+		| am_installed = installed_bin "bin/windres"
+		| otherwise    = "windres"
+
 	; let dflags0 = defaultDynFlags
 #ifndef mingw32_HOST_OS
 	-- check whether TMPDIR is set in the environment
@@ -326,7 +338,8 @@ initSysTools mbMinusB dflags
 			pgm_l	= (ld_prog,ld_args),
 			pgm_dll = (mkdll_prog,mkdll_args),
                         pgm_T   = touch_path,
-                        pgm_sysman = top_dir ++ "/ghc/rts/parallel/SysMan"
+                        pgm_sysman = top_dir ++ "/ghc/rts/parallel/SysMan",
+                        pgm_windres = windres_path
         		-- Hans: this isn't right in general, but you can 
         		-- elaborate it in the same way as the others
                 }
@@ -518,6 +531,20 @@ runMkDLL dflags args = do
   mb_env <- getGccEnv (args0++args)
   runSomethingFiltered dflags id "Make DLL" p args1 mb_env
 
+runWindres :: DynFlags -> [Option] -> IO ()
+runWindres dflags args = do
+  let (gcc,gcc_args) = pgm_c dflags
+      windres        = pgm_windres dflags
+  mb_env <- getGccEnv gcc_args
+  runSomethingFiltered dflags id "Windres" windres 
+        -- we must tell windres where to find gcc: it might not be on PATH
+        (Option ("--preprocessor=" ++ gcc ++ " " ++
+                                      unwords (map showOpt gcc_args) ++
+                 " -E -xc -DRC_INVOKED")
+         : args)
+        -- we must use the PATH workaround here too, since windres invokes gcc
+        mb_env
+
 touch :: DynFlags -> String -> String -> IO ()
 touch dflags purpose arg =
   runSomething dflags purpose (pgm_T dflags) [FileOption "" arg]