From f506c3a5a8dde7f62109b626bdae58fc8c3f1441 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 18 Apr 2007 11:45:10 +0000 Subject: Follow Cabal changes in Setup.hs --- Setup.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Setup.hs') diff --git a/Setup.hs b/Setup.hs index 3e5f12e..14b3bc1 100644 --- a/Setup.hs +++ b/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 -- cgit v1.2.3