Skip to content
Snippets Groups Projects
Commit e1960647 authored by Francesco Gazzetta's avatar Francesco Gazzetta
Browse files

Correctly get the symlinkBinDir

parent 6bded5a5
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,6 @@ import Distribution.Client.CmdErrorMessages ...@@ -22,7 +22,6 @@ import Distribution.Client.CmdErrorMessages
import Distribution.Client.Setup import Distribution.Client.Setup
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags ) ( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags )
import qualified Distribution.Client.Setup as Client
import Distribution.Client.Types import Distribution.Client.Types
( PackageSpecifier(NamedPackage), UnresolvedSourcePackage ) ( PackageSpecifier(NamedPackage), UnresolvedSourcePackage )
import Distribution.Client.ProjectPlanning.Types import Distribution.Client.ProjectPlanning.Types
...@@ -187,11 +186,15 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags) ...@@ -187,11 +186,15 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
(compilerId compiler) (compilerId compiler)
-- If there are exes, symlink them -- If there are exes, symlink them
let defaultSymlinkBindir = error $ let symlinkBindirUnknown =
"TODO: how do I get the default ~/.cabal (or ~/.local) directory?" "symlink-bindir is not defined. Set it in your cabal config file "
++ " (use --symlink-bindir explicitly for now)" </> "bin" ++ "or use --symlink-bindir=<path>"
symlinkBindir <- makeAbsolute $ fromFlagOrDefault defaultSymlinkBindir symlinkBindir <- fromFlagOrDefault (die' verbosity symlinkBindirUnknown)
(Client.installSymlinkBinDir installFlags) $ fmap makeAbsolute
$ projectConfigSymlinkBinDir
$ projectConfigBuildOnly
$ projectConfig $ baseCtx
createDirectoryIfMissingVerbose verbosity False symlinkBindir
traverse_ (symlinkBuiltPackage mkPkgBinDir symlinkBindir) traverse_ (symlinkBuiltPackage mkPkgBinDir symlinkBindir)
$ Map.toList $ targetsMap buildCtx $ Map.toList $ targetsMap buildCtx
runProjectPostBuildPhase verbosity baseCtx buildCtx buildOutcomes runProjectPostBuildPhase verbosity baseCtx buildCtx buildOutcomes
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment