[commit: ghc] wip/hadrian-ghc-in-ghci: David's rpath hack and -fno-code (d1688d8)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/hadrian-ghc-in-ghci
Link       : http://ghc.haskell.org/trac/ghc/changeset/d1688d82429c02959e848886c834a947f0ddec69/ghc

>---------------------------------------------------------------

commit d1688d82429c02959e848886c834a947f0ddec69
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Fri Mar 8 20:01:58 2019 +0000

    David's rpath hack and -fno-code


>---------------------------------------------------------------

d1688d82429c02959e848886c834a947f0ddec69
 hadrian/src/Settings/Builders/Ghc.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadrian/src/Settings/Builders/Ghc.hs b/hadrian/src/Settings/Builders/Ghc.hs
index 44a58bc..70b9f08 100644
--- a/hadrian/src/Settings/Builders/Ghc.hs
+++ b/hadrian/src/Settings/Builders/Ghc.hs
@@ -24,8 +24,7 @@ ghcInGhciArgs = do
               , map ("-optc" ++) <$> getStagedSettingList ConfCcArgs
               , map ("-optP" ++) <$> getStagedSettingList ConfCppArgs
               , map ("-optP" ++) <$> getContextData cppOpts
-
-              --, ghcLinkArgs
+              , arg "-fno-code"
               ]
 
 compileAndLinkHs :: Args
@@ -101,6 +100,7 @@ ghcLinkArgs = builder (Ghc LinkHs) ||^ builder (Ghc GhcInGhci) ? do
                 -- TODO what about windows?
                 , isLibrary pkg ? pure [ "-shared", "-dynload", "deploy" ]
                 , hostSupportsRPaths ? arg ("-optl-Wl,-rpath," ++ rpath)
+                , hostSupportsRPaths ? arg ("-optl-Wl,-rpath,$ORIGIN")
                 ]
             , arg "-no-auto-link-packages"
             ,      nonHsMainPackage pkg  ? arg "-no-hs-main"