X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FSysTools.lhs;h=f0b34228596d8f762030130f4dd8a801c00dc8dd;hb=6a05ec5ef5373f61b7f9f5bdc344483417fa801b;hp=92b88255523d242aeff01dd136b39dc6c8179559;hpb=5cbd9a995ce01f5850d7dd9e5fe3fbba6744acaf;p=ghc-hetmet.git

diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs
index 92b8825..f0b3422 100644
--- a/compiler/main/SysTools.lhs
+++ b/compiler/main/SysTools.lhs
@@ -7,6 +7,13 @@
 -----------------------------------------------------------------------------
 
 \begin{code}
+{-# OPTIONS -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/Commentary/CodingStyle#Warnings
+-- for details
+
 module SysTools (
 	-- Initialisation
 	initSysTools,
@@ -528,11 +535,15 @@ runWindres :: DynFlags -> [Option] -> IO ()
 runWindres dflags args = do
   let (gcc,gcc_args) = pgm_c dflags
       windres        = pgm_windres dflags
-  runSomething dflags "Windres" windres 
-        (Option ("--preprocessor=" ++ gcc ++ unwords (map showOpt gcc_args) ++
+  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 tell windres where to find gcc: it might not be on PATH
+        -- we must use the PATH workaround here too, since windres invokes gcc
+        mb_env
 
 touch :: DynFlags -> String -> String -> IO ()
 touch dflags purpose arg =