From da0a46a3f1373eafb3466cc7c67285e96fa63ce7 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Wed, 23 Jun 2021 10:28:07 +0100 Subject: linker: Replace one missed usage of Opt_RPath with useXLinkerRPath (cherry picked from commit f926ecfdcdf5468b8539bc8f4aad87404f1e397e) (cherry picked from commit 8b2554efe0ed942c3861c69963ce3ec1e72eb08e) --- compiler/GHC/Driver/Pipeline.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.1