[commit: hadrian] master: Add unlit to GHC's runtime dependencies (81f180a)

git at git.haskell.org git at git.haskell.org
Sat Feb 24 15:11:24 UTC 2018


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

On branch  : master
Link       : http://git.haskell.org/hadrian.git/commitdiff/81f180a0e3d485b388171c7b29946f7690177b3a

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

commit 81f180a0e3d485b388171c7b29946f7690177b3a
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Feb 9 02:30:00 2018 +0000

    Add unlit to GHC's runtime dependencies


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

81f180a0e3d485b388171c7b29946f7690177b3a
 src/Builder.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Builder.hs b/src/Builder.hs
index ae967ab..67e1634 100644
--- a/src/Builder.hs
+++ b/src/Builder.hs
@@ -145,12 +145,14 @@ instance H.Builder Builder where
         Ghc _ _ -> do
             win <- windowsHost
             touchyPath <- programPath (vanillaContext Stage0 touchy)
-            return $ [ inplaceLibPath -/- "ghc-usage.txt"
+            unlitPath  <- builderPath Unlit
+            return $ [ ghcSplitPath -- TODO: Make conditional on --split-objects
+                     , inplaceLibPath -/- "ghc-usage.txt"
                      , inplaceLibPath -/- "ghci-usage.txt"
                      , inplaceLibPath -/- "llvm-targets"
                      , inplaceLibPath -/- "platformConstants"
                      , inplaceLibPath -/- "settings"
-                     , ghcSplitPath ] -- TODO: Make conditional on --split-objects
+                     , unlitPath ]
                   ++ [ touchyPath | win ]
 
         Haddock _ -> return [haddockHtmlResourcesStamp]



More information about the ghc-commits mailing list