summaryrefslogtreecommitdiff
path: root/libraries/template-haskell/Setup.hs
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2007-04-18 11:44:48 +0000
committerIan Lynagh <igloo@earth.li>2007-04-18 11:44:48 +0000
commitdcc81088fd2652aef56041de165ef286c657f0fe (patch)
treed03367979c7f6533900f40ad2943000b176ba800 /libraries/template-haskell/Setup.hs
parentbbca21c4e06e142002739a564bc051ad1c00c292 (diff)
downloadhaskell-dcc81088fd2652aef56041de165ef286c657f0fe.tar.gz
Follow Cabal changes in Setup.hs
Diffstat (limited to 'libraries/template-haskell/Setup.hs')
-rw-r--r--libraries/template-haskell/Setup.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/libraries/template-haskell/Setup.hs b/libraries/template-haskell/Setup.hs
index 3e5f12e668..14b3bc134d 100644
--- a/libraries/template-haskell/Setup.hs
+++ b/libraries/template-haskell/Setup.hs
@@ -42,11 +42,10 @@ removePrefix (x:xs) (y:ys)
| x == y = removePrefix xs ys
| otherwise = Nothing
-type Hook a = PackageDescription -> LocalBuildInfo -> Maybe UserHooks -> a
- -> IO ()
+type Hook a = PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()
add_ghc_options :: [String] -> Hook a -> Hook a
-add_ghc_options args f pd lbi muhs x
+add_ghc_options args f pd lbi uhs x
= do let lib' = case library pd of
Just lib ->
let bi = libBuildInfo lib
@@ -55,5 +54,5 @@ add_ghc_options args f pd lbi muhs x
in lib { libBuildInfo = bi' }
Nothing -> error "Expected a library"
pd' = pd { library = Just lib' }
- f pd' lbi muhs x
+ f pd' lbi uhs x