Commit 1a7b657a authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Handle multiword options in build rules.

parent b9c1da83
......@@ -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)
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment