on master help sign in
Build LLVM rts at the right stage and clean up a namespace
1931f0bBenjamin Saunders
@@ -78,6 +78,8 @@ installLLVMLib verbosity pkg local copy =
78 let idir = datadir $ L.absoluteInstallDirs pkg local copy in
78 let idir = datadir $ L.absoluteInstallDirs pkg local copy in
79 make verbosity ["-C", "llvm", "install", "TARGET=" ++ idir </> "llvm"]
79 make verbosity ["-C", "llvm", "install", "TARGET=" ++ idir </> "llvm"]
80
80
81+buildLLVMLib verbosity = make verbosity ["-C", "llvm", "all"]
82+
81installJavaPom pkg local verbosity copy version = do
83installJavaPom pkg local verbosity copy version = do
82 putStrLn $ "Installing java pom template"
84 putStrLn $ "Installing java pom template"
83 let dir = datadir $ L.absoluteInstallDirs pkg local copy
85 let dir = datadir $ L.absoluteInstallDirs pkg local copy
@@ -169,6 +171,7 @@ main = do
169 cleanJavaPom verb
171 cleanJavaPom verb
170 , postBuild = \ _ flags _ lbi -> do
172 , postBuild = \ _ flags _ lbi -> do
171 let verb = S.fromFlag $ S.buildVerbosity flags
173 let verb = S.fromFlag $ S.buildVerbosity flags
174+ when (llvmFlag $ configFlags lbi) (buildLLVMLib verb)
172 let withoutEffects = noEffectsFlag $ configFlags lbi
175 let withoutEffects = noEffectsFlag $ configFlags lbi
173 checkStdLib lbi withoutEffects verb
176 checkStdLib lbi withoutEffects verb
174 }
177 }
src/IRTS/CodegenLLVM.hs+1−1
@@ -14,7 +14,7 @@ import LLVM.General.Context
14import LLVM.General.Diagnostic
14import LLVM.General.Diagnostic
15import LLVM.General.AST
15import LLVM.General.AST
16import LLVM.General.AST.AddrSpace
16import LLVM.General.AST.AddrSpace
17−import LLVM.General.Target
17+import LLVM.General.Target hiding (Target)
18import LLVM.General.AST.DataLayout
18import LLVM.General.AST.DataLayout
19import LLVM.General.PassManager
19import LLVM.General.PassManager
20import qualified LLVM.General.Module as M
20import qualified LLVM.General.Module as M