diff options
| author | Alexis King <lexi.lambda@gmail.com> | 2023-05-11 13:27:49 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2023-05-17 11:46:52 -0400 |
| commit | 1b6dc778ff160ba859b107af0e8040adb80ec777 (patch) | |
| tree | aa79b37f6207100edc541ea20f71db15429fdccc | |
| parent | cb8cd007b704d3d7cd922c2885dd6b68e6fbc5a9 (diff) | |
| download | haskell-1b6dc778ff160ba859b107af0e8040adb80ec777.tar.gz | |
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.
(cherry picked from commit 59aa4676a49b4f9d09c1cd3cc3b47c3c54b6ed80)
| -rw-r--r-- | hadrian/src/Settings/Builders/SplitSections.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hadrian/src/Settings/Builders/SplitSections.hs b/hadrian/src/Settings/Builders/SplitSections.hs index 215d164b55..024596e50c 100644 --- a/hadrian/src/Settings/Builders/SplitSections.hs +++ b/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 |