Properly set flags for implicit extra-deps #807

commercialhaskell · Aug 19, 2015 · b763b0e · b763b0e
1 parent 3643220
commit b763b0e
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/src/Stack/Build/Source.hs b/src/Stack/Build/Source.hs
@@ -119,7 +119,22 @@ loadSourceMap needTargets bopts = do
 
         -- Overwrite any flag settings with those from the config file
         extraDeps3 = Map.mapWithKey
-            (\n (v, f) -> PSUpstream v Local $ fromMaybe f $ Map.lookup n $ bcFlags bconfig)
+            (\n (v, f) -> PSUpstream v Local $
+                case ( Map.lookup (Just n) $ boptsFlags bopts
+                     , Map.lookup Nothing $ boptsFlags bopts
+                     , Map.lookup n $ bcFlags bconfig
+                     ) of
+                    -- Didn't have any flag overrides, fall back to the flags
+                    -- defined in the snapshot.
+                    (Nothing, Nothing, Nothing) -> f
+                    -- Either command line flag for this package, general
+                    -- command line flag, or flag in stack.yaml is defined.
+                    -- Take all of those and ignore the snapshot flags.
+                    (x, y, z) -> Map.unions
+                        [ fromMaybe Map.empty x
+                        , fromMaybe Map.empty y
+                        , fromMaybe Map.empty z
+                        ])
             extraDeps2
 
     let sourceMap = Map.unions