Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
f9261da4
Commit
f9261da4
authored
Jun 29, 2012
by
refold
Browse files
Remove 'tryCachedSetupExecutable'.
The function is very short and the name doesn't communicate clearly what it does.
parent
3db510f9
Changes
1
Show whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/SetupWrapper.hs
View file @
f9261da4
...
...
@@ -192,7 +192,9 @@ externalSetupMethod verbosity options pkg bt mkargs = do
debug
verbosity
$
"Using Cabal library version "
++
display
cabalLibVersion
setupHs
<-
updateSetupScript
cabalLibVersion
bt
debug
verbosity
$
"Using "
++
setupHs
++
" as setup script."
path
<-
tryCachedSetupExecutable
options'
cabalLibVersion
setupHs
path
<-
case
bt
of
Simple
->
getCachedSetupExecutable
options'
cabalLibVersion
setupHs
_
->
compileSetupExecutable
options'
cabalLibVersion
setupHs
invokeSetupScript
path
(
mkargs
cabalLibVersion
)
where
...
...
@@ -288,14 +290,6 @@ externalSetupMethod verbosity options pkg bt mkargs = do
Custom
->
error
"buildTypeScript Custom"
UnknownBuildType
_
->
error
"buildTypeScript UnknownBuildType"
-- | Given the versions of the compiler and the Cabal lib, try to find the
-- cached setup executable.
tryCachedSetupExecutable
::
SetupScriptOptions
->
Version
->
FilePath
->
IO
FilePath
tryCachedSetupExecutable
=
case
bt
of
Simple
->
getCachedSetupExecutable
_
->
compileSetupExecutable
-- | Look up the setup executable in the cache; update the cache if the setup
-- executable is not found.
getCachedSetupExecutable
::
SetupScriptOptions
->
Version
->
FilePath
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment