diff options
| author | Adam Sandberg Ericsson <adam@sandbergericsson.se> | 2021-11-05 18:04:24 +0000 |
|---|---|---|
| committer | Adam Sandberg Ericsson <adam@sandbergericsson.se> | 2021-11-05 18:04:24 +0000 |
| commit | 7e77131440115c10cf3b7d3b14b1cce57a5dc21f (patch) | |
| tree | 55a8d5b04f196b3fe77897fb631a4793958efeac | |
| parent | d96ce59dc86799f0cf07da2ce5a55b189a50c130 (diff) | |
| download | haskell-wip/adamse/dynlink-when-static.tar.gz | |
poc for static ghc but loading dynlibswip/adamse/dynlink-when-static
| -rw-r--r-- | compiler/GHC/Linker/Loader.hs | 5 |
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 |