[commit: ghc] wip/nfs-locking: Handle multiword options in build rules. (1a7b657)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/1a7b657a0b02d361a5ba69f1c68d772e43b3e47b/ghc

>---------------------------------------------------------------

commit 1a7b657a0b02d361a5ba69f1c68d772e43b3e47b
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 6 19:19:10 2015 +0000

    Handle multiword options in build rules.


>---------------------------------------------------------------

1a7b657a0b02d361a5ba69f1c68d772e43b3e47b
 src/Package/Data.hs         | 4 ++--
 src/Package/Dependencies.hs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Package/Data.hs b/src/Package/Data.hs
index fe3ec26..b156eaa 100644
--- a/src/Package/Data.hs
+++ b/src/Package/Data.hs
@@ -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)
diff --git a/src/Package/Dependencies.hs b/src/Package/Dependencies.hs
index 4327ca6..ede14bb 100644
--- a/src/Package/Dependencies.hs
+++ b/src/Package/Dependencies.hs
@@ -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))