projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
164be78
)
make -include-pkg-deps work (not sure when this got lost)
author
Simon Marlow
<marlowsd@gmail.com>
Fri, 28 Nov 2008 13:57:46 +0000
(13:57 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Fri, 28 Nov 2008 13:57:46 +0000
(13:57 +0000)
compiler/main/DriverMkDepend.hs
patch
|
blob
|
history
diff --git
a/compiler/main/DriverMkDepend.hs
b/compiler/main/DriverMkDepend.hs
index
ef28c2c
..
5cf8e64
100644
(file)
--- 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
-> 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
= 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
-> return (Just (addBootSuffix_maybe is_boot (ml_hi_file loc)))
-- Not in this package: we don't need a dependency