Repository : ssh://g...@git.haskell.org/Cabal
On branch : ghc-head
Link :
http://git.haskell.org/packages/Cabal.git/commitdiff/3235cce2d008a9f55d253afb16f380fde38aa286
>---------------------------------------------------------------
commit 3235cce2d008a9f55d253afb16f380fde38aa286
Author: Johan Tibell <johan.tib...@gmail.com>
Date: Thu Sep 12 10:31:03 2013 -0700
Revert "Only pass executable name from run to build"
This fix is incorrect since "--" was already stripped out of extraArgs.
This reverts commit 9092b59a045485c164d1b758601d0422aa18f70f.
(cherry picked from commit 37af946a3e58056695f1ecaed92143705e677bb9)
>---------------------------------------------------------------
3235cce2d008a9f55d253afb16f380fde38aa286
cabal-install/Main.hs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index 689570f..70551b9 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -813,9 +813,8 @@ runAction (buildFlags, buildExFlags) extraArgs globalFlags
= do
globalFlags noAddSource (buildNumJobs buildExFlags)
(const Nothing)
- let components = takeWhile (/= "--") extraArgs
maybeWithSandboxDirOnSearchPath useSandbox $
- build verbosity distPref mempty components
+ build verbosity distPref mempty extraArgs
maybeWithSandboxDirOnSearchPath useSandbox $
run verbosity buildFlags extraArgs
_______________________________________________
ghc-commits mailing list
ghc-commits@haskell.org
http://www.haskell.org/mailman/listinfo/ghc-commits
