Merge pull request #2305 from AaronFriel/fix-2289

Fix issue #2289, apply ghc-options to snapshot pkg
commercialhaskell · Jun 30, 2016 · 5f06731 · 5f06731
2 parents 2f76519 + 675f834
commit 5f06731
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Stack/Build/Source.hs b/src/Stack/Build/Source.hs
@@ -147,8 +147,9 @@ loadSourceMap needTargets boptsCli = do
                 let p = lpPackage lp
                  in (packageName p, PSLocal lp)
             , extraDeps3
-            , flip fmap (mbpPackages mbp) $ \mpi ->
-                PSUpstream (mpiVersion mpi) Snap (mpiFlags mpi) (mpiGhcOptions mpi) (mpiGitSHA1 mpi)
+            , flip Map.mapWithKey (mbpPackages mbp) $ \n mpi ->
+                let configOpts = getGhcOptions bconfig boptsCli n False False
+                 in PSUpstream (mpiVersion mpi) Snap (mpiFlags mpi) (mpiGhcOptions mpi ++ configOpts) (mpiGitSHA1 mpi)
             ] `Map.difference` Map.fromList (map (, ()) (HashSet.toList wiredInPackages))
 
     return (targets, mbp, locals, nonLocalTargets, sourceMap)