summaryrefslogtreecommitdiff
path: root/compiler/main/DriverMkDepend.hs
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2008-11-28 13:57:46 +0000
committerSimon Marlow <marlowsd@gmail.com>2008-11-28 13:57:46 +0000
commit08b5047aa14afcd8a1286145a5a5bbf54b587982 (patch)
tree3550c0a2773f5c587beabd9995af18c29d9d2f76 /compiler/main/DriverMkDepend.hs
parent164be7854f6de07bb4bc15f60af727ddb562cde7 (diff)
downloadhaskell-08b5047aa14afcd8a1286145a5a5bbf54b587982.tar.gz
make -include-pkg-deps work (not sure when this got lost)
Diffstat (limited to 'compiler/main/DriverMkDepend.hs')
-rw-r--r--compiler/main/DriverMkDepend.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/main/DriverMkDepend.hs b/compiler/main/DriverMkDepend.hs
index ef28c2cb30..5cf8e64f6e 100644
--- a/compiler/main/DriverMkDepend.hs
+++ b/compiler/main/DriverMkDepend.hs
@@ -222,14 +222,14 @@ findDependency :: HscEnv
-> IsBootInterface -- Source import
-> Bool -- Record dependency on package modules
-> IO (Maybe FilePath) -- Interface file file
-findDependency hsc_env _ imp is_boot _include_pkg_deps
+findDependency hsc_env _ imp is_boot include_pkg_deps
= do { -- Find the module; this will be fast because
-- we've done it once during downsweep
r <- findImportedModule hsc_env imp Nothing
; case r of
Found loc _
-- Home package: just depend on the .hi or hi-boot file
- | isJust (ml_hs_file loc)
+ | isJust (ml_hs_file loc) || include_pkg_deps
-> return (Just (addBootSuffix_maybe is_boot (ml_hi_file loc)))
-- Not in this package: we don't need a dependency