Commit febee92c authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺
Browse files

Revert "Update Haddock submodule"

This reverts commit 34d68d8e
as it breaks the build:

  Configuring hsc2hs-0.67...
  Configuring ghc-cabal-0.1...
  Configuring parallel-
  Configuring hpc-bin-0.67...
  Configuring haddock-2.16.0...
  ghc-cabal: At least the following dependencies are missing:
  ghc >=7.9 && <7.11
  make[1]: *** [utils/haddock/dist/] Error 1
  make[1]: *** Waiting for unfinished jobs....
    GHC PKG libraries/parallel/dist-install/
  Reading package info from "libraries/parallel/dist-install/inplace-pkg-config" ... done.
  parallel- Warning: haddock-interfaces: /srv/builds/commits/rGHC/B3035-34d68d8e/libraries/parallel/dist-install/doc/html/parallel/parallel.haddock doesn't exist or isn't a file
  parallel- cannot find any of ["Control/Seq.hi","Control/Seq.p_hi","Control/Seq.dyn_hi"] (ignoring)
  parallel- cannot find any of ["Control/Parallel.hi","Control/Parallel.p_hi","Control/Parallel.dyn_hi"] (ignoring)
  parallel- cannot find any of ["Control/Parallel/Strategies.hi","Control/Parallel/Strategies.p_hi","Control/Parallel/Strategies.dyn_hi"] (ignoring)
  parallel- cannot find any of ["libHSparal_791B1zx5CJ25cUOFECtmw0.a","libHSparal_791B1zx5CJ25cUOFECtmw0.p_a","","libHSparal_791B1zx5CJ25cUOFECtmw0-ghc7.11.20150123.dylib","HSparal_791B1zx5CJ25cUOFECtmw0-ghc7.11.20150123.dll"] on library path (ignoring)
  make: *** [all] Error 2

Moreover, utils/haddock is supposed to track the `ghc-head` branch
(which is what `git submodule update --remote utils/haddock` helps with)
parent 34d68d8e
Subproject commit bf77580eb40fa960b701296ac828372d127a43dd
Subproject commit d61bbc75890e4eb0ad508b9c2a27b91f691213e6
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment