Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
39dd4391
Commit
39dd4391
authored
Oct 06, 2007
by
bjorn@bringert.net
Browse files
Remove the unused configRunHc.
parent
765f3558
Changes
4
Hide whitespace changes
Inline
Side-by-side
cabal-install/src/Network/Hackage/CabalInstall/Configure.hs
View file @
39dd4391
...
...
@@ -108,12 +108,10 @@ localPrefix
mkConfigFlags
::
TempFlags
->
IO
ConfigFlags
mkConfigFlags
cfg
=
do
let
verbosity
=
tempVerbose
cfg
conf
=
userMaybeSpecifyPath
"runhaskell"
(
tempRunHc
cfg
)
$
userMaybeSpecifyPath
"tar"
(
tempTarPath
cfg
)
$
conf
=
userMaybeSpecifyPath
"tar"
(
tempTarPath
cfg
)
$
defaultProgramConfiguration
(
runHc
,
conf'
)
<-
requireProgram
verbosity
runhaskellProgram
AnyVersion
conf
(
tarProg
,
conf''
)
<-
requireProgram
verbosity
tarProgram
AnyVersion
conf'
(
comp
,
conf'''
)
<-
Configure
.
configCompiler
(
tempHcFlavor
cfg
)
(
tempHcPath
cfg
)
(
tempHcPkg
cfg
)
conf''
verbosity
(
tarProg
,
conf'
)
<-
requireProgram
verbosity
tarProgram
AnyVersion
conf
(
comp
,
conf''
)
<-
Configure
.
configCompiler
(
tempHcFlavor
cfg
)
(
tempHcPath
cfg
)
(
tempHcPkg
cfg
)
conf'
verbosity
let
userIns
=
tempUserIns
cfg
prefix
<-
if
userIns
then
fmap
Just
(
maybe
localPrefix
return
(
tempPrefix
cfg
))
...
...
@@ -130,13 +128,12 @@ mkConfigFlags cfg
outputGen
<-
defaultOutputGen
(
tempVerbose
cfg
)
let
config
=
ConfigFlags
{
configCompiler
=
comp
,
configPrograms
=
conf''
'
,
configPrograms
=
conf''
,
configConfDir
=
confDir
,
configCacheDir
=
cacheDir
,
configPrefix
=
prefix
,
configServers
=
[]
,
configTarPath
=
programPath
tarProg
,
configRunHc
=
programPath
runHc
,
configOutputGen
=
outputGen
,
configVerbose
=
tempVerbose
cfg
-- , configUpgradeDeps = tempUpgradeDeps cfg
...
...
cabal-install/src/Network/Hackage/CabalInstall/Install.hs
View file @
39dd4391
...
...
@@ -113,8 +113,7 @@ installPkg cfg globalArgs (pkg,ops,repo)
extractTarFile
tarProg
tmpPkgPath
installUnpackedPkg
cfg
pkg
tmpPkgPath
setup
return
()
)
where
runHc
=
configRunHc
cfg
tarProg
=
configTarPath
cfg
where
tarProg
=
configTarPath
cfg
output
=
configOutputGen
cfg
installUnpackedPkg
::
ConfigFlags
->
PackageIdentifier
->
FilePath
...
...
cabal-install/src/Network/Hackage/CabalInstall/Setup.hs
View file @
39dd4391
...
...
@@ -38,7 +38,6 @@ emptyTempFlags = TempFlags {
tempCacheDir
=
Nothing
,
tempHcPkg
=
Nothing
,
tempPrefix
=
Nothing
,
tempRunHc
=
Nothing
,
tempTarPath
=
Nothing
,
tempVerbose
=
normal
,
-- tempUpgradeDeps = False,
...
...
cabal-install/src/Network/Hackage/CabalInstall/Types.hs
View file @
39dd4391
...
...
@@ -47,7 +47,6 @@ data TempFlags = TempFlags {
tempHcPkg
::
Maybe
FilePath
,
-- ^given hc-pkg location
tempPrefix
::
Maybe
FilePath
,
tempTarPath
::
Maybe
FilePath
,
tempRunHc
::
Maybe
FilePath
,
tempVerbose
::
Verbosity
,
-- ^verbosity level
-- tempUpgradeDeps :: Bool,
tempUserIns
::
Bool
,
-- ^--user-install flag
...
...
@@ -62,7 +61,6 @@ data ConfigFlags = ConfigFlags {
configPrefix
::
Maybe
FilePath
,
configServers
::
[
Repo
],
-- ^Available Hackage servers.
configTarPath
::
FilePath
,
configRunHc
::
FilePath
,
configOutputGen
::
OutputGen
,
configVerbose
::
Verbosity
,
-- configUpgradeDeps :: Bool,
...
...
Write
Preview
Supports
Markdown
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