aboutsummaryrefslogtreecommitdiff
path: root/src/Main.hs
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2009-03-24 11:04:31 +0000
committerSimon Marlow <marlowsd@gmail.com>2009-03-24 11:04:31 +0000
commit611a30585cb6ee482bfd0eeb2c0feb9e678325fd (patch)
tree3e762b1a7348bf4faaeea1402f0a016412e17948 /src/Main.hs
parentfeba58ecdacf70498f745c91085ed5a40dad3023 (diff)
update for new GHC build system layout
Diffstat (limited to 'src/Main.hs')
-rw-r--r--src/Main.hs8
1 files changed, 8 insertions, 0 deletions
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