[Git][ghc/ghc][master] hadrian: Fix linker script flag for MergeObjects builder

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
59aa4676 by Alexis King at 2023-05-12T19:28:47-04:00
hadrian: Fix linker script flag for MergeObjects builder

This fixes what appears to have been a typo in !9530. The `-t` flag just
enables tracing on all versions of `ld` I’ve looked at, while `-T` is
used to specify a linker script. It seems that this worked anyway for
some reason on some `ld` implementations (perhaps because they
automatically detect linker scripts), but the missing `-T` argument
causes `gold` to complain.

- - - - -


1 changed file:

- hadrian/src/Settings/Builders/SplitSections.hs


Changes:

=====================================
hadrian/src/Settings/Builders/SplitSections.hs
=====================================
@@ -30,7 +30,7 @@ splitSectionsArgs = do
     ( mconcat
         [ builder (Ghc CompileHs) ? arg "-fsplit-sections"
         , builder MergeObjects ? ifM (expr isWinTarget)
-            (pure ["-t", "driver/utils/merge_sections_pe.ld"])
-            (pure ["-t", "driver/utils/merge_sections.ld"])
+            (pure ["-T", "driver/utils/merge_sections_pe.ld"])
+            (pure ["-T", "driver/utils/merge_sections.ld"])
         ]
     ) else mempty



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/59aa4676a49b4f9d09c1cd3cc3b47c3c54b6ed80

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/59aa4676a49b4f9d09c1cd3cc3b47c3c54b6ed80
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230512/0c7f7548/attachment.html>