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
GHC
Commits
1a7b657a
Commit
1a7b657a
authored
Jan 06, 2015
by
Andrey Mokhov
Browse files
Handle multiword options in build rules.
parent
b9c1da83
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Package/Data.hs
View file @
1a7b657a
...
...
@@ -21,8 +21,8 @@ configureArgs stage settings =
argConf
key
as
=
joinArgs
"--configure-option="
key
"="
as
argConfWith
key
opt
=
do
[
value
]
<-
showAction
opt
when
(
value
/=
""
)
$
argConf
(
"--with-"
++
key
)
$
arg
value
opts
<-
showAction
opt
when
(
opts
/=
[]
)
$
argConf
(
"--with-"
++
key
)
$
arg
opts
cflags
=
joinArgsSpaced
(
commonCcArgs
`
filterOut
`
[
"-Werror"
])
(
ConfCcArgs
stage
)
...
...
src/Package/Dependencies.hs
View file @
1a7b657a
...
...
@@ -81,7 +81,7 @@ buildPackageDependencies pkg @ (Package name path _) (stage, dist, settings) =
run
(
Ghc
stage
)
$
mconcat
[
arg
"-M"
,
wayHcOpts
vanilla
-- TODO: i) is this needed? ii) shall we run GHC -M multiple times?
,
splitArgs
$
arg
SrcHcOpts
-- TODO: get rid of splitArgs
,
arg
SrcHcOpts
-- TODO: get rid of splitArgs
,
when
(
stage
==
Stage0
)
$
arg
"-package-db libraries/bootstrapping.conf"
,
arg
$
if
usePackageKey
then
"-this-package-key"
else
"-package-name"
,
arg
packageKey
-- TODO: check reasoning ($$($4_THIS_PACKAGE_KEY) $$($1_$2_PACKAGE_KEY))
...
...
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