From 1c3d4480c8751665e71e344b71a844ca4191acc5 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Fri, 24 Aug 2007 14:33:30 +0000 Subject: [PATCH] windres also needs the PATH workaround, because it runs gcc --- compiler/main/SysTools.lhs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs index fe660ec..2d4333c 100644 --- a/compiler/main/SysTools.lhs +++ b/compiler/main/SysTools.lhs @@ -528,12 +528,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 = -- 1.7.10.4