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

nh2 · Aug 4, 2019 · b243ce7 · b243ce7
1 parent 83b27d9
commit b243ce7
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Cabal/Distribution/Simple/GHC.hs b/Cabal/Distribution/Simple/GHC.hs
@@ -578,6 +578,10 @@ buildOrReplLib mReplFlags verbosity numJobs pkg_descr lbi lib clbi = do
                       ghcOptLinkOptions       = PD.ldOptions libBi
                                                 ++ [ "-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,
@@ -1275,6 +1279,10 @@ gbuild verbosity numJobs pkg_descr lbi bm clbi = do
                       ghcOptLinkOptions       = PD.ldOptions bnfo
                                                 ++ [ "-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 $