Pass ld-options through to GHC. Fixes haskell#4925

nh2 · Jul 20, 2018 · 8f4c02f · 8f4c02f
1 parent e892df7
commit 8f4c02f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Cabal/Distribution/Simple/GHC.hs b/Cabal/Distribution/Simple/GHC.hs
@@ -610,7 +610,11 @@ buildOrReplLib mReplFlags verbosity numJobs pkg_descr lbi lib clbi = do
                     }
       linkerOpts = mempty {
                       ghcOptLinkOptions       = PD.ldOptions libBi
-                                                ++ [ "-static" | withFullyStaticExe lbi ],
+                                                ++ [ "-static" | withFullyStaticExe lbi ]
+                                                -- Pass extra `ld-options` given
+                                                -- through to GHC's linker.
+                                                ++ maybe [] programOverrideArgs
+                                                     (lookupProgram ldProgram (withPrograms lbi))
                       ghcOptLinkLibs          = extraLibs libBi,
                       ghcOptLinkLibPath       = toNubListR $ extraLibDirs libBi,
                       ghcOptLinkFrameworks    = toNubListR $ PD.frameworks libBi,
@@ -1292,7 +1296,11 @@ gbuild verbosity numJobs pkg_descr lbi bm clbi = do
                     }
       linkerOpts = mempty {
                       ghcOptLinkOptions       = PD.ldOptions bnfo
-                                                ++ [ "-static" | withFullyStaticExe lbi ],
+                                                ++ [ "-static" | withFullyStaticExe lbi ]
+                                                -- Pass extra `ld-options` given
+                                                -- through to GHC's linker.
+                                                ++ maybe [] programOverrideArgs
+                                                     (lookupProgram ldProgram (withPrograms lbi)),
                       ghcOptLinkLibs          = extraLibs bnfo,
                       ghcOptLinkLibPath       = toNubListR $ extraLibDirs bnfo,
                       ghcOptLinkFrameworks    = toNubListR $