diff options
Diffstat (limited to 'hadrian/src/Rules/ToolArgs.hs')
| -rw-r--r-- | hadrian/src/Rules/ToolArgs.hs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hadrian/src/Rules/ToolArgs.hs b/hadrian/src/Rules/ToolArgs.hs index eff690cd9b..105ed8f15a 100644 --- a/hadrian/src/Rules/ToolArgs.hs +++ b/hadrian/src/Rules/ToolArgs.hs @@ -49,8 +49,8 @@ mkToolTarget es p = do -- This builds automatically generated dependencies. Not sure how to do -- this generically yet. allDeps - let fake_target = target (Context Stage0 p (if windowsHost then vanilla else dynamic)) - (Ghc ToolArgs Stage0) [] ["ignored"] + let fake_target = target (Context stage0InTree p (if windowsHost then vanilla else dynamic)) + (Ghc ToolArgs stage0InTree) [] ["ignored"] arg_list <- interpret fake_target getArgs liftIO $ putStrLn (intercalate "\n" (arg_list ++ es)) allDeps :: Action () @@ -59,14 +59,14 @@ allDeps = do -- We can't build DLLs on Windows (yet). Actually we should only -- include the dynamic way when we have a dynamic host GHC, but just -- checking for Windows seems simpler for now. - let fake_target = target (Context Stage0 compiler (if windowsHost then vanilla else dynamic)) - (Ghc ToolArgs Stage0) [] ["ignored"] + let fake_target = target (Context stage0InTree compiler (if windowsHost then vanilla else dynamic)) + (Ghc ToolArgs stage0InTree) [] ["ignored"] -- need the autogenerated files so that they are precompiled interpret fake_target Rules.Generate.compilerDependencies >>= need root <- buildRoot - let dir = buildDir (vanillaContext Stage0 compiler) + let dir = buildDir (vanillaContext stage0InTree compiler) need [ root -/- dir -/- "GHC" -/- "Settings" -/- "Config.hs" ] need [ root -/- dir -/- "GHC" -/- "Parser.hs" ] need [ root -/- dir -/- "GHC" -/- "Parser" -/- "Lexer.hs" ] @@ -114,12 +114,12 @@ dirMap = do -- configuring would build the whole GHC library which we probably -- don't want to do. mkGhc = do - let c = (Context Stage0 compiler (if windowsHost then vanilla else dynamic)) + let c = (Context stage0InTree compiler (if windowsHost then vanilla else dynamic)) cd <- readContextData c fp <- liftIO $ canonicalizePath "ghc/" return (fp, (compiler, "-ighc" : modules cd ++ otherModules cd ++ ["ghc/Main.hs"])) go p = do - let c = (Context Stage0 p (if windowsHost then vanilla else dynamic)) + let c = (Context stage0InTree p (if windowsHost then vanilla else dynamic)) -- readContextData has the effect of configuring the package so all -- dependent packages will also be built. cd <- readContextData c |