diff options
Diffstat (limited to 'hadrian/src/Rules/Compile.hs')
| -rw-r--r-- | hadrian/src/Rules/Compile.hs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hadrian/src/Rules/Compile.hs b/hadrian/src/Rules/Compile.hs index 12a8707f31..0efcea9474 100644 --- a/hadrian/src/Rules/Compile.hs +++ b/hadrian/src/Rules/Compile.hs @@ -39,6 +39,9 @@ compilePackage rs = do [ root -/- "**/build/cmm/**/*." ++ wayPat ++ "o" | wayPat <- wayPats] |%> compileNonHsObject rs Cmm + [ root -/- "**/build/cpp/**/*." ++ wayPat ++ "o" + | wayPat <- wayPats] |%> compileNonHsObject rs Cxx + [ root -/- "**/build/s/**/*." ++ wayPat ++ "o" | wayPat <- wayPats] |%> compileNonHsObject rs Asm @@ -112,12 +115,13 @@ compilePackage rs = do -} -- | Non Haskell source languages that we compile to get object files. -data SourceLang = Asm | C | Cmm deriving (Eq, Show) +data SourceLang = Asm | C | Cmm | Cxx deriving (Eq, Show) parseSourceLang :: Parsec.Parsec String () SourceLang parseSourceLang = Parsec.choice [ Parsec.char 'c' *> Parsec.choice [ Parsec.string "mm" *> pure Cmm + , Parsec.string "pp" *> pure Cxx , pure C ] , Parsec.char 's' *> pure Asm @@ -227,11 +231,13 @@ compileNonHsObject rs lang path = do ctx = objectContext b builder = case lang of C -> Ghc CompileCWithGhc + Cxx-> Ghc CompileCppWithGhc _ -> Ghc CompileHs src <- case lang of Asm -> obj2src "S" (const False) ctx path C -> obj2src "c" (const False) ctx path Cmm -> obj2src "cmm" isGeneratedCmmFile ctx path + Cxx -> obj2src "cpp" (const False) ctx path need [src] needDependencies ctx src (path <.> "d") buildWithResources rs $ target ctx (builder stage) [src] [path] |