projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make -dynload sysdep mean to embed rpaths in shared libs as well as binaries
[ghc-hetmet.git]
/
compiler
/
main
/
Packages.lhs
diff --git
a/compiler/main/Packages.lhs
b/compiler/main/Packages.lhs
index
c5784ce
..
86b4693
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(..), GhcLink(..) )
+import DynFlags ( dopt, DynFlag(..), DynFlags(..), PackageFlag(..) )
import StaticFlags ( opt_Static )
import Config ( cProjectVersion )
import Name ( Name, nameModule_maybe )
import StaticFlags ( opt_Static )
import Config ( cProjectVersion )
import Name ( Name, nameModule_maybe )
@@
-390,7
+390,6
@@
findWiredInPackages dflags pkgs preload this_package = do
(basePackageId, [""]),
(rtsPackageId, [""]),
(haskell98PackageId, [""]),
(basePackageId, [""]),
(rtsPackageId, [""]),
(haskell98PackageId, [""]),
- (sybPackageId, [""]),
(thPackageId, [""]),
(dphSeqPackageId, [""]),
(dphParPackageId, [""])]
(thPackageId, [""]),
(dphSeqPackageId, [""]),
(dphParPackageId, [""])]
@@
-563,7
+562,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 && (ghcLink dflags) /= LinkDynLib
+ | dopt Opt_AutoLinkPackages dflags
= 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