Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch :
http://hackage.haskell.org/trac/ghc/changeset/73523d73b19af7fa11eeea9a5ecea130c24450c9 >--------------------------------------------------------------- commit 73523d73b19af7fa11eeea9a5ecea130c24450c9 Author: Duncan Coutts <[email protected]> Date: Tue Oct 7 21:36:30 2008 +0000 Fix search paths for compiling Setup.hs scrips and in particular for bootstrapping the Cabal lib. >--------------------------------------------------------------- cabal-install/Distribution/Client/SetupWrapper.hs | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cabal-install/Distribution/Client/SetupWrapper.hs b/cabal-install/Distribution/Client/SetupWrapper.hs index 42e8eca..8b7331e 100644 --- a/cabal-install/Distribution/Client/SetupWrapper.hs +++ b/cabal-install/Distribution/Client/SetupWrapper.hs @@ -276,10 +276,11 @@ externalSetupMethod verbosity options pkg bt mkargs = do rawSystemProgramConf verbosity ghcProgram conf $ ghcVerbosityOptions verbosity ++ ["--make", setupHsFile, "-o", setupProgFile - ,"-odir", setupDir, "-hidir", setupDir] + ,"-odir", setupDir, "-hidir", setupDir + ,"-i", "-i" ++ workingDir ] ++ if packageName pkg == PackageName "Cabal" - then ["-i", "-i."] - else ["-i", "-package", display cabalPkgid ] + then [] + else ["-package", display cabalPkgid] where cabalPkgid = PackageIdentifier (PackageName "Cabal") cabalLibVersion invokeSetupScript :: [String] -> IO () _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
