From b0e1adc337081e7736adf4ba37e58832d87cc45d Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 18 Jul 2009 13:15:55 +0000 Subject: [PATCH] Make ghc-cabal handle "Custom" Setup.hs files that have a configure script --- utils/ghc-cabal/ghc-cabal.hs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/utils/ghc-cabal/ghc-cabal.hs b/utils/ghc-cabal/ghc-cabal.hs index 8511369..7d2f522 100644 --- a/utils/ghc-cabal/ghc-cabal.hs +++ b/utils/ghc-cabal/ghc-cabal.hs @@ -158,8 +158,16 @@ generate config_args distdir directory withArgs (["configure", "--distdir", distdir] ++ config_args) (case buildType (flattenPackageDescription gpd) of Just Configure -> defaultMainWithHooks autoconfUserHooks - _other -> defaultMain) - -- not quite right, but good enough for us + -- time has a "Custom" Setup.hs, but it's actually Configure + -- plus a "./Setup test" hook. However, Cabal is also + -- "Custom", but doesn't have a configure script. + Just Custom -> + do configureExists <- doesFileExist "configure" + if configureExists + then defaultMainWithHooks autoconfUserHooks + else defaultMain + -- not quite right, but good enough for us: + _ -> defaultMain) lbi <- getPersistBuildConfig distdir let pd0 = localPkgDescr lbi -- 1.7.10.4