[commit: Cabal] master: Use the right options when compiling external Setup prog (8d31448)
Ian Lynagh
igloo at earth.li
Fri Jun 24 01:59:00 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8d31448f9f45a0b15acd75308af426e61eb30015
>---------------------------------------------------------------
commit 8d31448f9f45a0b15acd75308af426e61eb30015
Author: Duncan Coutts <duncan at haskell.org>
Date: Sun Aug 24 20:25:56 2008 +0000
Use the right options when compiling external Setup prog
So the cabal version constraint is actually passed in.
This got lost in a previous refactoring.
>---------------------------------------------------------------
cabal-install/Distribution/Client/SetupWrapper.hs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cabal-install/Distribution/Client/SetupWrapper.hs b/cabal-install/Distribution/Client/SetupWrapper.hs
index 279c5ba..863aa47 100644
--- a/cabal-install/Distribution/Client/SetupWrapper.hs
+++ b/cabal-install/Distribution/Client/SetupWrapper.hs
@@ -108,7 +108,7 @@ setupWrapper verbosity options mpkg cmd flags extraArgs = do
mkArgs cabalLibVersion = commandName cmd
: commandShowOptions cmd (flags cabalLibVersion)
++ extraArgs
- setupMethod verbosity options (packageId pkg) buildType' mkArgs
+ setupMethod verbosity options' (packageId pkg) buildType' mkArgs
where
getPkg = findPackageDesc (fromMaybe "." (useWorkingDir options))
>>= readPackageDescription verbosity
More information about the Cvs-libraries
mailing list