diff options
| -rw-r--r-- | compiler/ghci/Linker.hs | 22 | ||||
| -rwxr-xr-x | testsuite/tests/ghci/scripts/all.T | 1 |
2 files changed, 12 insertions, 11 deletions
diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs index cec09048c2..3e8423c432 100644 --- a/compiler/ghci/Linker.hs +++ b/compiler/ghci/Linker.hs @@ -119,9 +119,9 @@ data PersistentLinkerState -- that is really important pkgs_loaded :: ![PackageKey], - -- we need to remember the name of the last temporary DLL/.so - -- so we can link it - last_temp_so :: !(Maybe (FilePath, String)) } + -- we need to remember the name of previous temporary DLL/.so + -- libraries so we can link them (see #10322) + temp_sos :: ![(FilePath, String)] } emptyPLS :: DynFlags -> PersistentLinkerState @@ -131,7 +131,7 @@ emptyPLS _ = PersistentLinkerState { pkgs_loaded = init_pkgs, bcos_loaded = [], objs_loaded = [], - last_temp_so = Nothing } + temp_sos = [] } -- Packages that don't need loading, because the compiler -- shares them with the interpreted program. @@ -841,19 +841,19 @@ dynLoadObjs dflags pls objs = do dflags2 = dflags1 { -- We don't want the original ldInputs in -- (they're already linked in), but we do want - -- to link against the previous dynLoadObjs - -- library if there was one, so that the linker + -- to link against previous dynLoadObjs + -- libraries if there were any, so that the linker -- can resolve dependencies when it loads this -- library. ldInputs = - case last_temp_so pls of - Nothing -> [] - Just (lp, l) -> + concatMap + (\(lp, l) -> [ Option ("-L" ++ lp) , Option ("-Wl,-rpath") , Option ("-Wl," ++ lp) , Option ("-l" ++ l) - ], + ]) + (temp_sos pls), -- Even if we're e.g. profiling, we still want -- the vanilla dynamic libraries, so we set the -- ways / build tag to be just WayDyn. @@ -868,7 +868,7 @@ dynLoadObjs dflags pls objs = do consIORef (filesToNotIntermediateClean dflags) soFile m <- loadDLL soFile case m of - Nothing -> return pls { last_temp_so = Just (libPath, libName) } + Nothing -> return pls { temp_sos = (libPath, libName) : temp_sos pls } Just err -> panic ("Loading temp shared object failed: " ++ err) rmDupLinkables :: [Linkable] -- Already loaded diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index e0f230185b..e4ec994384 100755 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -218,3 +218,4 @@ test('T10408B', normal, run_command, ['$MAKE -s --no-print-directory T10408B']) test('T10248', normal, ghci_script, ['T10248.script']) test('T10110', normal, ghci_script, ['T10110.script']) +test('T10322', normal, ghci_script, ['T10322.script']) |