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
a7469b85
Commit
a7469b85
authored
Dec 01, 2013
by
Mikhail Glushenkov
Browse files
'cabal configure' shouldn't accept the 'dependency' option.
parent
3c9600ed
Changes
2
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/Config.hs
View file @
a7469b85
...
...
@@ -371,7 +371,8 @@ configFieldDescriptions =
++
toSavedConfig
liftConfigFlag
(
configureOptions
ParseArgs
)
([
"builddir"
,
"configure-option"
,
"constraint"
]
++
map
fieldName
installDirsFields
)
([
"builddir"
,
"configure-option"
,
"constraint"
,
"dependency"
]
++
map
fieldName
installDirsFields
)
--FIXME: this is only here because viewAsFieldDescr gives us a parser
-- that only recognises 'ghc' etc, the case-sensitive flag names, not
...
...
cabal-install/Distribution/Client/Setup.hs
View file @
a7469b85
...
...
@@ -861,7 +861,8 @@ installCommand = CommandUI {
++
" Constrained package version
\n
"
,
commandDefaultFlags
=
(
mempty
,
mempty
,
mempty
,
mempty
),
commandOptions
=
\
showOrParseArgs
->
liftOptions
get1
set1
(
filter
((
/=
"constraint"
)
.
optionName
)
$
liftOptions
get1
set1
(
filter
((`
notElem
`
[
"constraint"
,
"dependency"
])
.
optionName
)
$
configureOptions
showOrParseArgs
)
++
liftOptions
get2
set2
(
configureExOptions
showOrParseArgs
)
++
liftOptions
get3
set3
(
installOptions
showOrParseArgs
)
...
...
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