diff options
| -rw-r--r-- | ghc.mk | 2 | ||||
| -rw-r--r-- | src/Main.hs | 8 |
2 files changed, 9 insertions, 1 deletions
@@ -3,7 +3,7 @@ utils/haddock_USES_CABAL = YES utils/haddock_PACKAGE = haddock utils/haddock_CONFIGURE_OPTS = --flag in-ghc-tree # XXX This is a temporary hack: -utils/haddock_HC_OPTS += -Wwarn +utils/haddock_HC_OPTS += -Wwarn -DNEW_GHC_LAYOUT utils/haddock_dist_SHELL_WRAPPER = YES utils/haddock_dist_INSTALL_SHELL_WRAPPER = YES utils/haddock_dist_PROG = haddock$(exeext) diff --git a/src/Main.hs b/src/Main.hs index cde7790c..c4b916b6 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -156,7 +156,11 @@ main = handleTopExceptions $ do do m <- getExecDir case m of Nothing -> error "No GhcLibDir found" +#ifdef NEW_GHC_LAYOUT + Just d -> return (d </> ".." </> "lib") +#else Just d -> return (d </> "..") +#endif #else return libdir -- from GHC.Paths #endif @@ -237,7 +241,11 @@ render flags ifaces installedIfaces = do do m <- getExecDir case m of Nothing -> error "No libdir found" +#ifdef NEW_GHC_LAYOUT + Just d -> return (d </> ".." </> "lib") +#else Just d -> return (d </> "..") +#endif #else getDataDir -- provided by Cabal #endif |