Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Cabal
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Haskell
Cabal
Commits
e1960647
Commit
e1960647
authored
7 years ago
by
Francesco Gazzetta
Browse files
Options
Downloads
Patches
Plain Diff
Correctly get the symlinkBinDir
parent
6bded5a5
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cabal-install/Distribution/Client/CmdInstall.hs
+9
-6
9 additions, 6 deletions
cabal-install/Distribution/Client/CmdInstall.hs
with
9 additions
and
6 deletions
cabal-install/Distribution/Client/CmdInstall.hs
+
9
−
6
View file @
e1960647
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment