[commit: ghc] wip/nfs-locking: Pass HsOpts to ghc -M. (b75a548)

[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/b75a548ad3e0c117a11db7cfc3d0ed0e00960612/ghc

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

commit b75a548ad3e0c117a11db7cfc3d0ed0e00960612
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Jan 15 02:06:25 2015 +0000

    Pass HsOpts to ghc -M.


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

b75a548ad3e0c117a11db7cfc3d0ed0e00960612
 src/Package/Dependencies.hs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Package/Dependencies.hs b/src/Package/Dependencies.hs
index 1d3a8d2..f296419 100644
--- a/src/Package/Dependencies.hs
+++ b/src/Package/Dependencies.hs
@@ -17,11 +17,8 @@ buildPackageDependencies (Package name path _) (stage, dist, settings) =
             <> productArgs ["-odir", "-stubdir", "-hidir"] buildDir
             <> arg ["-dep-makefile", toStandard $ out <.> "new"]
             <> productArgs "-dep-suffix" (map wayPrefix <$> ways settings)
+            <> arg (HsOpts pkgData)
             <> arg (pkgHsSources path dist)
-            -- TODO: Check that skipping all _HC_OPTS is safe.
-            -- <> arg SrcHcOpts
-            -- TODO: i) is this needed? ii) shall we run GHC -M multiple times?
-            -- <> wayHcOpts vanilla
         -- Avoid rebuilding dependecies of out if it hasn't changed:
         -- Note: cannot use copyFileChanged as it depends on the source file
         deps <- liftIO $ readFile $ out <.> "new"