summaryrefslogtreecommitdiff
path: root/compiler/GHC/Linker/Loader.hs
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/GHC/Linker/Loader.hs')
-rw-r--r--compiler/GHC/Linker/Loader.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/GHC/Linker/Loader.hs b/compiler/GHC/Linker/Loader.hs
index 2af6f4dfe1..a512fa9a89 100644
--- a/compiler/GHC/Linker/Loader.hs
+++ b/compiler/GHC/Linker/Loader.hs
@@ -1228,6 +1228,7 @@ unload_wkr interp keep_linkables pls@LoaderState{..} = do
partOfGHCi :: [PackageName]
partOfGHCi
| isWindowsHost || isDarwinHost = []
+ | True = []
| otherwise = map (PackageName . mkFastString)
["base", "template-haskell", "editline"]
@@ -1292,7 +1293,7 @@ loadPackage interp hsc_env pkg
let logger = hsc_logger hsc_env
platform = targetPlatform dflags
is_dyn = interpreterDynamic interp
- dirs | is_dyn = map ST.unpack $ Packages.unitLibraryDynDirs pkg
+ dirs | True || is_dyn = map ST.unpack $ Packages.unitLibraryDynDirs pkg
| otherwise = map ST.unpack $ Packages.unitLibraryDirs pkg
let hs_libs = map ST.unpack $ Packages.unitLibraries pkg
@@ -1511,7 +1512,7 @@ locateLib interp hsc_env is_hs lib_dirs gcc_dirs lib
tryGcc `orElse`
assumeDll
- | loading_dynamic_hs_libs -- search for .so libraries first.
+ | True || loading_dynamic_hs_libs -- search for .so libraries first.
= findHSDll `orElse`
findDynObject `orElse`
assumeDll