Commit 4df75772 authored by David Eichmann's avatar David Eichmann 🏋 Committed by Marge Bot

Hadrian: remove unneeded rpaths.

Issue #12770
parent d10e2368
Pipeline #3542 failed with stages
in 164 minutes and 17 seconds
...@@ -74,8 +74,15 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do ...@@ -74,8 +74,15 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do
dynamic = Dynamic `wayUnit` way dynamic = Dynamic `wayUnit` way
distPath = libPath' -/- distDir distPath = libPath' -/- distDir
originToLibsDir = makeRelativeNoSysLink originPath distPath originToLibsDir = makeRelativeNoSysLink originPath distPath
rpath | darwin = "@loader_path" -/- originToLibsDir rpath
| otherwise = "$ORIGIN" -/- originToLibsDir -- Programs will end up in the bin dir ($ORIGIN) and will link to
-- libraries in the lib dir.
| isProgram pkg = metaOrigin -/- originToLibsDir
-- libraries will all end up in the lib dir, so just use $ORIGIN
| otherwise = metaOrigin
where
metaOrigin | darwin = "@loader_path"
| otherwise = "$ORIGIN"
-- TODO: an alternative would be to generalize by linking with extra -- TODO: an alternative would be to generalize by linking with extra
-- bundled libraries, but currently the rts is the only use case. It is -- bundled libraries, but currently the rts is the only use case. It is
...@@ -92,8 +99,10 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do ...@@ -92,8 +99,10 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do
[ arg "-dynamic" [ arg "-dynamic"
-- TODO what about windows? -- TODO what about windows?
, isLibrary pkg ? pure [ "-shared", "-dynload", "deploy" ] , isLibrary pkg ? pure [ "-shared", "-dynload", "deploy" ]
, hostSupportsRPaths ? arg ("-optl-Wl,-rpath," ++ rpath) , hostSupportsRPaths ? pure
, hostSupportsRPaths ? arg ("-optl-Wl,-rpath,$ORIGIN") [ "-optl-Wl,-rpath," ++ rpath
, "-optl-Wl,-zorigin"
]
] ]
, arg "-no-auto-link-packages" , arg "-no-auto-link-packages"
, nonHsMainPackage pkg ? arg "-no-hs-main" , nonHsMainPackage pkg ? arg "-no-hs-main"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment