diff options
Diffstat (limited to 'hadrian/src')
| -rw-r--r-- | hadrian/src/Rules/Lint.hs | 9 | ||||
| -rw-r--r-- | hadrian/src/Settings/Builders/Cabal.hs | 3 | ||||
| -rw-r--r-- | hadrian/src/Settings/Builders/Common.hs | 2 | ||||
| -rw-r--r-- | hadrian/src/Settings/Builders/DeriveConstants.hs | 2 | ||||
| -rw-r--r-- | hadrian/src/Settings/Builders/HsCpp.hs | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/hadrian/src/Rules/Lint.hs b/hadrian/src/Rules/Lint.hs index 218dff8047..828744ba0b 100644 --- a/hadrian/src/Rules/Lint.hs +++ b/hadrian/src/Rules/Lint.hs @@ -48,7 +48,7 @@ base :: Action () base = do buildDir <- buildRoot let stage1Lib = buildDir </> "stage1/lib" - let machDeps = "includes/MachDeps.h" + let machDeps = "rts/include/MachDeps.h" let ghcautoconf = stage1Lib </> "ghcautoconf.h" let ghcplatform = stage1Lib </> "ghcplatform.h" -- ./configure is called here manually because we need to generate @@ -60,7 +60,7 @@ base = do cmd_ (Cwd "libraries/base") "./configure" need [ghcautoconf, ghcplatform, machDeps] let includeDirs = - [ "includes" + [ "rts/include" , "libraries/base/include" , stage1Lib ] @@ -71,14 +71,13 @@ compiler = do buildDir <- buildRoot let stage1Lib = buildDir </> "stage1/lib" let stage1Compiler = buildDir </> "stage1/compiler/build" - let machDeps = "includes/MachDeps.h" + let machDeps = "rts/include/MachDeps.h" let compilerDir = "compiler" let ghcautoconf = stage1Lib </> "ghcautoconf.h" let ghcplatform = stage1Lib </> "ghcplatform.h" need $ mconcat [[ghcautoconf, ghcplatform], hsIncls stage1Compiler, [machDeps]] let includeDirs = - [ "includes" - , stage1Lib + [ stage1Lib , compilerDir , ghcplatform , stage1Compiler diff --git a/hadrian/src/Settings/Builders/Cabal.hs b/hadrian/src/Settings/Builders/Cabal.hs index c175cd6500..468757adca 100644 --- a/hadrian/src/Settings/Builders/Cabal.hs +++ b/hadrian/src/Settings/Builders/Cabal.hs @@ -113,8 +113,7 @@ configureArgs = do , arg $ "-I" ++ libPath -- See https://github.com/snowleopard/hadrian/issues/523 , arg $ "-iquote" - , arg $ top -/- pkgPath pkg - , arg $ "-I" ++ top -/- "includes" ] + , arg $ top -/- pkgPath pkg ] ldFlags = ldArgs <> (getStagedSettingList ConfGccLinkerArgs) cppFlags = cppArgs <> (getStagedSettingList ConfCppArgs) cldFlags <- unwords <$> (cFlags <> ldFlags) diff --git a/hadrian/src/Settings/Builders/Common.hs b/hadrian/src/Settings/Builders/Common.hs index dfb90a1003..8daa8a1f88 100644 --- a/hadrian/src/Settings/Builders/Common.hs +++ b/hadrian/src/Settings/Builders/Common.hs @@ -31,7 +31,7 @@ cIncludeArgs = do ffiIncludeDir <- getSetting FfiIncludeDir libdwIncludeDir <- getSetting FfiIncludeDir libPath <- expr $ stageLibPath stage - mconcat [ notStage0 ||^ package compiler ? arg "-Iincludes" + mconcat [ notStage0 ||^ package compiler ? arg "-Irts/include" , arg $ "-I" ++ libPath , arg $ "-I" ++ path , pure . map ("-I"++) . filter (/= "") $ [iconvIncludeDir, gmpIncludeDir] diff --git a/hadrian/src/Settings/Builders/DeriveConstants.hs b/hadrian/src/Settings/Builders/DeriveConstants.hs index 63813050b4..6801dc05fb 100644 --- a/hadrian/src/Settings/Builders/DeriveConstants.hs +++ b/hadrian/src/Settings/Builders/DeriveConstants.hs @@ -42,7 +42,7 @@ includeCcArgs = do , getSettingList $ ConfCcArgs Stage1 , flag GhcUnregisterised ? arg "-DUSE_MINIINTERPRETER" , arg "-Irts" - , arg "-Iincludes" + , arg "-Irts/include" , arg $ "-I" ++ libPath , notM targetSupportsSMP ? arg "-DNOSMP" , arg "-fcommon" ] diff --git a/hadrian/src/Settings/Builders/HsCpp.hs b/hadrian/src/Settings/Builders/HsCpp.hs index 4595e2098e..9f821d66b8 100644 --- a/hadrian/src/Settings/Builders/HsCpp.hs +++ b/hadrian/src/Settings/Builders/HsCpp.hs @@ -10,7 +10,7 @@ hsCppBuilderArgs = builder HsCpp ? do libPath <- expr $ stageLibPath stage mconcat [ getSettingList HsCppArgs , arg "-P" - , arg "-Iincludes" + , arg "-Irts/include" , arg $ "-I" ++ libPath , arg $ "-I" ++ ghcPath , arg "-x", arg "c" |