From 8b2554efe0ed942c3861c69963ce3ec1e72eb08e Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 23 Jun 2021 10:28:07 +0100
Subject: [PATCH] linker: Replace one missed usage of Opt_RPath with
useXLinkerRPath
(cherry picked from commit f926ecfdcdf5468b8539bc8f4aad87404f1e397e)
---
compiler/main/DriverPipeline.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index a7663819dad2..1bc08779cc65 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1747,7 +1747,7 @@ linkBinary' staticLink dflags o_files dep_packages = 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)
--
GitLab