X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FSysTools.lhs;h=f0b34228596d8f762030130f4dd8a801c00dc8dd;hb=6a05ec5ef5373f61b7f9f5bdc344483417fa801b;hp=fe660ec37d9986f4fb52b10888c6eeeac929deeb;hpb=d225ee32742486a136a5d39606c24a6f9ec5c2b9;p=ghc-hetmet.git diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs index fe660ec..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,12 +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 + 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 =