[commit: hadrian] master: add dependency on llvm-passes (112588a)
git at git.haskell.org
git at git.haskell.org
Wed May 16 20:53:43 UTC 2018
Repository : ssh://git@git.haskell.org/hadrian
On branch : master
Link : http://git.haskell.org/hadrian.git/commitdiff/112588a45989a8bc108b747ae47128b5776b102a
>---------------------------------------------------------------
commit 112588a45989a8bc108b747ae47128b5776b102a
Author: Kavon Farvardin <kavon at farvard.in>
Date: Wed May 16 15:52:15 2018 -0500
add dependency on llvm-passes
see https://phabricator.haskell.org/D4695
>---------------------------------------------------------------
112588a45989a8bc108b747ae47128b5776b102a
src/Base.hs | 1 +
src/Rules/Generate.hs | 1 +
src/Rules/Program.hs | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Base.hs b/src/Base.hs
index fea33a9..430078d 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -111,6 +111,7 @@ ghcDeps stage = mapM (\f -> stageLibPath stage <&> (-/- f))
[ "ghc-usage.txt"
, "ghci-usage.txt"
, "llvm-targets"
+ , "llvm-passes"
, "platformConstants"
, "settings" ]
diff --git a/src/Rules/Generate.hs b/src/Rules/Generate.hs
index cc2bf4b..8355ccc 100644
--- a/src/Rules/Generate.hs
+++ b/src/Rules/Generate.hs
@@ -164,6 +164,7 @@ copyRules = do
prefix -/- "ghc-usage.txt" <~ return "driver"
prefix -/- "ghci-usage.txt" <~ return "driver"
prefix -/- "llvm-targets" <~ return "."
+ prefix -/- "llvm-passes" <~ return "."
prefix -/- "platformConstants" <~ (buildRoot <&> (-/- generatedDir))
prefix -/- "settings" <~ return "."
prefix -/- "template-hsc.h" <~ return (pkgPath hsc2hs)
diff --git a/src/Rules/Program.hs b/src/Rules/Program.hs
index 67a310f..228c345 100644
--- a/src/Rules/Program.hs
+++ b/src/Rules/Program.hs
@@ -43,7 +43,7 @@ buildProgram rs = do
need [tmpl]
when (package == ghc) $ do
-- ghc depends on settings, platformConstants, llvm-targets
- -- ghc-usage.txt, ghci-usage.txt
+ -- llvm-passes, ghc-usage.txt, ghci-usage.txt
need =<< ghcDeps stage
cross <- crossCompiling
More information about the ghc-commits
mailing list