diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-06-23 10:28:07 +0100 |
|---|---|---|
| committer | Zubin Duggal <zubin.duggal@gmail.com> | 2021-09-21 22:28:30 +0530 |
| commit | da0a46a3f1373eafb3466cc7c67285e96fa63ce7 (patch) | |
| tree | 7502b50ae6304ad342bdaa48151a7c59387dd542 | |
| parent | 857664a88e055eb5cf1bdf3fca8c2e8d4648197e (diff) | |
| download | haskell-da0a46a3f1373eafb3466cc7c67285e96fa63ce7.tar.gz | |
linker: Replace one missed usage of Opt_RPath with useXLinkerRPath
(cherry picked from commit f926ecfdcdf5468b8539bc8f4aad87404f1e397e)
(cherry picked from commit 8b2554efe0ed942c3861c69963ce3ec1e72eb08e)
| -rw-r--r-- | compiler/GHC/Driver/Pipeline.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/GHC/Driver/Pipeline.hs b/compiler/GHC/Driver/Pipeline.hs index e8ada6a3a5..46fc97ae9e 100644 --- a/compiler/GHC/Driver/Pipeline.hs +++ b/compiler/GHC/Driver/Pipeline.hs @@ -1746,7 +1746,7 @@ linkBinary' staticLink dflags o_files dep_units = do | osMachOTarget (platformOS platform) && dynLibLoader dflags == SystemDependent && WayDyn `elem` ways dflags && - gopt Opt_RPath dflags + useXLinkerRPath dflags (platformOS platform) = let libpath = if gopt Opt_RelativeDynlibPaths dflags then "@loader_path" </> (l `makeRelativeTo` full_output_fn) |