projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No AutoLinkPackages for dynamic library linking
[ghc-hetmet.git]
/
compiler
/
main
/
Packages.lhs
diff --git
a/compiler/main/Packages.lhs
b/compiler/main/Packages.lhs
index
e2a0a04
..
c5784ce
100644
(file)
--- a/
compiler/main/Packages.lhs
+++ b/
compiler/main/Packages.lhs
@@
-37,7
+37,7
@@
where
import PackageConfig
import ParsePkgConf ( loadPackageConfig )
import PackageConfig
import ParsePkgConf ( loadPackageConfig )
-import DynFlags ( dopt, DynFlag(..), DynFlags(..), PackageFlag(..) )
+import DynFlags ( dopt, DynFlag(..), DynFlags(..), PackageFlag(..), GhcLink(..) )
import StaticFlags ( opt_Static )
import Config ( cProjectVersion )
import Name ( Name, nameModule_maybe )
import StaticFlags ( opt_Static )
import Config ( cProjectVersion )
import Name ( Name, nameModule_maybe )
@@
-393,8
+393,7
@@
findWiredInPackages dflags pkgs preload this_package = do
(sybPackageId, [""]),
(thPackageId, [""]),
(dphSeqPackageId, [""]),
(sybPackageId, [""]),
(thPackageId, [""]),
(dphSeqPackageId, [""]),
- (dphParPackageId, [""]),
- (ndpPackageId, ["-seq", "-par"]) ]
+ (dphParPackageId, [""])]
matches :: PackageConfig -> (PackageId, [String]) -> Bool
pc `matches` (pid, suffixes)
matches :: PackageConfig -> (PackageId, [String]) -> Bool
pc `matches` (pid, suffixes)
@@
-564,7
+563,7
@@
mkPackageState dflags orig_pkg_db preload0 this_package = do
-- add base & rts to the preload packages
basicLinkedPackages
-- add base & rts to the preload packages
basicLinkedPackages
- | dopt Opt_AutoLinkPackages dflags
+ | dopt Opt_AutoLinkPackages dflags && (ghcLink dflags) /= LinkDynLib
= filter (flip elemUFM pkg_db) [basePackageId, rtsPackageId]
| otherwise = []
-- but in any case remove the current package from the set of
= filter (flip elemUFM pkg_db) [basePackageId, rtsPackageId]
| otherwise = []
-- but in any case remove the current package from the set of