[commit: ghc] wip/nfs-locking: Build rts in stage1 instead of dist (c4c7a7f)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:35:33 UTC 2017


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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/c4c7a7f8d710c1a02ff68456f7ee9cb8fd5aa3a3/ghc

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

commit c4c7a7f8d710c1a02ff68456f7ee9cb8fd5aa3a3
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Mon Jan 4 20:26:14 2016 +0800

    Build rts in stage1 instead of dist
    
    `rts/dist` is hardcoded, while the shake build system builds in `rts/stage1`. Fixes #86


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

c4c7a7f8d710c1a02ff68456f7ee9cb8fd5aa3a3
 src/Rules/Data.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Rules/Data.hs b/src/Rules/Data.hs
index 274092b..b68f1c7 100644
--- a/src/Rules/Data.hs
+++ b/src/Rules/Data.hs
@@ -104,7 +104,7 @@ buildPackageData rs target @ (PartialTarget stage pkg) = do
                      , "includes/ghcplatform.h" ]
                 build $ fullTarget target HsCpp [rtsConfIn] [rtsConf]
                 old <- liftIO $ readFile rtsConf
-                let new = unlines . map (replace "\"\"" "")
+                let new = unlines . map (replace "\"\"" "" . replace "rts/dist/build" "rts/stage1/build")
                         . filter (not . null) $ lines old
                 liftIO $ length new `seq` writeFile rtsConf new
 



More information about the ghc-commits mailing list