Skip to content

Use a non-default build dir when building add-source deps. #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2013
Merged

Use a non-default build dir when building add-source deps. #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cabal-install/Distribution/Client/Sandbox.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,10 @@ reinstallAddSourceDeps :: Verbosity
-> InstallFlags -> GlobalFlags
-> FilePath
-> IO WereDepsReinstalled
reinstallAddSourceDeps verbosity config configFlags configExFlags
reinstallAddSourceDeps verbosity config configFlags' configExFlags
installFlags globalFlags sandboxDir = do
let configFlags = configFlags'
{ configDistPref = Flag "sandbox-dist" }
indexFile <- tryGetIndexFilePath config
buildTreeRefs <- Index.listBuildTreeRefs verbosity
Index.DontListIgnored indexFile
Expand Down
9 changes: 7 additions & 2 deletions cabal-install/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ import Distribution.Client.Sandbox (sandboxInit
,dumpPackageEnvironment

,UseSandbox(..)
,whenUsingSandbox
,isUseSandbox, whenUsingSandbox
,ForceGlobalInstall(..)
,maybeForceGlobalInstall
,loadConfigOrSandboxConfig
Expand Down Expand Up @@ -458,7 +458,12 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
(configUserInstall configFlags)
targets <- readUserTargets verbosity extraArgs

let configFlags' = savedConfigureFlags config `mappend` configFlags
let configFlags' =
let flags = savedConfigureFlags config `mappend` configFlags
in if isUseSandbox useSandbox
then flags {configDistPref = Flag "sandbox-dist"}
else flags

configExFlags' = defaultConfigExFlags `mappend`
savedConfigureExFlags config `mappend` configExFlags
installFlags' = defaultInstallFlags `mappend`
Expand Down