[commit: ghc] wip/nfs-locking: Adds ghcautoconf and ghcplatform as dependencies to hp2ps. (456d2bd)

git at git.haskell.org git at git.haskell.org
Thu Oct 26 23:31:18 UTC 2017


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

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

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

commit 456d2bdadab272bc40d63f166e0eeaaf0a13ca02
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Sun Dec 27 14:41:23 2015 +0800

    Adds ghcautoconf and ghcplatform as dependencies to hp2ps.
    
     1fcb025 added includes to the dependencies for the `compiler` package, but `hp2ps` already requires them and is built prior to the `compiler` package. This should fix #48 for good.
    
    Also updates the README.md to reflect the closure of #44.


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

456d2bdadab272bc40d63f166e0eeaaf0a13ca02
 README.md                 | 3 ---
 src/Rules/Dependencies.hs | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ca1e5fb..93674a1 100644
--- a/README.md
+++ b/README.md
@@ -55,9 +55,6 @@ git submodule update --init
 git clone git://github.com/snowleopard/shaking-up-ghc shake-build
 ./boot
 ./configure --with-gcc=$(which clang) # See #26
-./shake-build/build.sh includes/ghcautoconf.h # See #48
-./shake-build/build.sh includes/ghcplatform.h # See #48
-cp utils/hsc2hs/template-hsc.h inplace/lib/template-hsc.h # See #44
 ./shake-build/build.sh
 ```
 
diff --git a/src/Rules/Dependencies.hs b/src/Rules/Dependencies.hs
index 5d08df1..197fa64 100644
--- a/src/Rules/Dependencies.hs
+++ b/src/Rules/Dependencies.hs
@@ -19,12 +19,14 @@ buildPackageDependencies _ target @ (PartialTarget stage pkg) =
         (buildPath <//> "*.c.deps") %> \out -> do
             let srcFile = dropBuild . dropExtension $ out
             when (pkg == compiler) . need $ platformH : includesDependencies
+            when (pkg == hp2ps) . need $ ["includes/ghcautoconf.h", "includes/ghcplatform.h"]
             need [srcFile]
             build $ fullTarget target (GccM stage) [srcFile] [out]
 
         hDepFile %> \out -> do
             srcs <- interpretPartial target getPackageSources
             when (pkg == compiler) . need $ platformH : includesDependencies
+            when (pkg == hp2ps) . need $ ["includes/ghcautoconf.h", "includes/ghcplatform.h"]
             -- TODO: very ugly and fragile; use gcc -MM instead?
             let extraDeps = if pkg /= compiler then [] else fmap (buildPath -/-)
                    [ "primop-vector-uniques.hs-incl"



More information about the ghc-commits mailing list