[commit: ghc] master: Add dependency on the new "llvm-passes" file. (#604) (85f2506)

git at git.haskell.org git at git.haskell.org
Tue Oct 23 20:17:04 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/85f2506f87c890ba985825c74dea92c10e80152e/ghc

>---------------------------------------------------------------

commit 85f2506f87c890ba985825c74dea92c10e80152e
Author: Kavon Farvardin <kavon at farvard.in>
Date:   Wed May 16 18:28:04 2018 -0500

    Add dependency on the new "llvm-passes" file. (#604)
    
    For details, see https://phabricator.haskell.org/D4695


>---------------------------------------------------------------

85f2506f87c890ba985825c74dea92c10e80152e
 src/Base.hs           | 1 +
 src/Rules/Generate.hs | 1 +
 src/Rules/Program.hs  | 3 ++-
 3 files changed, 4 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 aebaaab..083f3cd 100644
--- a/src/Rules/Program.hs
+++ b/src/Rules/Program.hs
@@ -45,7 +45,8 @@ buildProgram rs = do
                         need [template]
                     when (package == ghc) $ do
                         -- GHC depends on @settings@, @platformConstants@,
-                        -- @llvm-targets@, @ghc-usage.txt@, @ghci-usage.txt at .
+                        -- @llvm-targets@, @ghc-usage.txt@, @ghci-usage.txt@,
+                        -- @llvm-passes at .
                         need =<< ghcDeps stage
 
                     cross <- crossCompiling



More information about the ghc-commits mailing list