Skip to content
GitLab
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
a037bb48
Commit
a037bb48
authored
Aug 31, 2008
by
Duncan Coutts
Browse files
Use the new Program utils to simplify code in Configure
parent
77f31664
Changes
1
Hide whitespace changes
Inline
Side-by-side
Distribution/Simple/Configure.hs
View file @
a037bb48
...
...
@@ -91,7 +91,7 @@ import Distribution.Simple.Program
(
Program
(
..
),
ProgramLocation
(
..
),
ConfiguredProgram
(
..
)
,
ProgramConfiguration
,
defaultProgramConfiguration
,
configureAllKnownPrograms
,
knownPrograms
,
userSpecifyArgs
,
userSpecifyPath
,
userSpecifyArgs
s
,
userSpecifyPath
s
,
lookupKnownProgram
,
requireProgram
,
pkgConfigProgram
,
rawSystemProgramStdoutConf
)
import
Distribution.Simple.Setup
...
...
@@ -272,12 +272,9 @@ configure (pkg_descr0, pbi) cfg
createDirectoryIfMissingVerbose
(
lessVerbose
verbosity
)
True
distPref
let
programsConfig
=
flip
(
foldl
userSpecifyArgs'
)
(
configProgramArgs
cfg
)
.
flip
(
foldl
userSpecifyPath'
)
(
configProgramPaths
cfg
)
$
configPrograms
cfg
userSpecifyArgs'
conf
(
prog
,
args
)
=
userSpecifyArgs
prog
args
conf
userSpecifyPath'
conf
(
prog
,
path
)
=
userSpecifyPath
prog
path
conf
let
programsConfig
=
userSpecifyArgss
(
configProgramArgs
cfg
)
.
userSpecifyPaths
(
configProgramPaths
cfg
)
$
configPrograms
cfg
userInstall
=
fromFlag
(
configUserInstall
cfg
)
defaultPackageDB
|
userInstall
=
UserPackageDB
|
otherwise
=
GlobalPackageDB
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment