From da25c9e43ad8ace0b6ee3ca14fa1e026d3a855fb Mon Sep 17 00:00:00 2001 From: Debian Haskell Group Date: Wed, 1 Apr 2015 11:35:10 +0000 Subject: [PATCH] haddock-hardcode-ghc-paths =================================================================== Gbp-Pq: Name haddock-hardcode-ghc-paths --- utils/haddock/haddock.cabal | 6 ------ utils/haddock/src/Haddock.hs | 5 ++--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/utils/haddock/haddock.cabal b/utils/haddock/haddock.cabal index 2c102bc0..c9cc1662 100644 --- a/utils/haddock/haddock.cabal +++ b/utils/haddock/haddock.cabal @@ -118,10 +118,6 @@ executable haddock library default-language: Haskell2010 - -- In a GHC tree - in particular, in a source tarball - we don't - -- require alex or happy - if !flag(in-ghc-tree) - build-tools: alex >= 2.3, happy >= 1.18 build-depends: base >= 4.3 && < 4.7, filepath, @@ -135,8 +131,6 @@ library if flag(in-ghc-tree) cpp-options: -DIN_GHC_TREE - else - build-depends: ghc-paths hs-source-dirs: src if flag(dev) diff --git a/utils/haddock/src/Haddock.hs b/utils/haddock/src/Haddock.hs index f79f3470..8752d228 100644 --- a/utils/haddock/src/Haddock.hs +++ b/utils/haddock/src/Haddock.hs @@ -50,7 +50,6 @@ import Data.Int #ifdef IN_GHC_TREE import System.FilePath #else -import qualified GHC.Paths as GhcPaths import Paths_haddock #endif @@ -349,14 +348,14 @@ getGhcDirs flags = do libDir <- getInTreeDir return (ghcPath, libDir) #else - return (ghcPath, GhcPaths.libdir) + return (ghcPath, "/usr/lib/ghc") #endif xs -> return (ghcPath, last xs) where #ifdef IN_GHC_TREE ghcPath = "not available" #else - ghcPath = GhcPaths.ghc + ghcPath = "/usr/bin/ghc" #endif -- 2.30.2