diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-08-01 11:34:32 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-08-05 04:00:39 -0400 |
| commit | 53ce0db5a06598c88c6b8cb32043b878e7083dd4 (patch) | |
| tree | 281c045c9f198c5bb046780881931b41de1f15d4 /hadrian/cfg | |
| parent | 2bff2f87e43985e02bdde8c6fa39279df86cb617 (diff) | |
| download | haskell-53ce0db5a06598c88c6b8cb32043b878e7083dd4.tar.gz | |
Refactor handling of object merging
Previously to merge a set of object files we would invoke the linker as
usual, adding -r to the command-line. However, this can result in
non-sensical command-lines which causes lld to balk (#17962).
To avoid this we introduce a new tool setting into GHC, -pgmlm, which is
the linker which we use to merge object files.
Diffstat (limited to 'hadrian/cfg')
| -rw-r--r-- | hadrian/cfg/system.config.in | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/hadrian/cfg/system.config.in b/hadrian/cfg/system.config.in index e1b7684b84..7fba53f43e 100644 --- a/hadrian/cfg/system.config.in +++ b/hadrian/cfg/system.config.in @@ -115,6 +115,12 @@ conf-ld-linker-args-stage1 = @CONF_LD_LINKER_OPTS_STAGE1@ conf-ld-linker-args-stage2 = @CONF_LD_LINKER_OPTS_STAGE2@ conf-ld-linker-args-stage3 = @CONF_LD_LINKER_OPTS_STAGE3@ +conf-merge-objects-args-stage0 = @SettingsMergeObjectsFlags@ +conf-merge-objects-args-stage1 = @SettingsMergeObjectsFlags@ +conf-merge-objects-args-stage2 = @SettingsMergeObjectsFlags@ +conf-merge-objects-args-stage3 = @SettingsMergeObjectsFlags@ + + # Settings: #========== @@ -138,6 +144,8 @@ settings-c-compiler-link-flags = @SettingsCCompilerLinkFlags@ settings-c-compiler-supports-no-pie = @SettingsCCompilerSupportsNoPie@ settings-ld-command = @SettingsLdCommand@ settings-ld-flags = @SettingsLdFlags@ +settings-merge-objects-command = @SettingsMergeObjectsCommand@ +settings-merge-objects-flags = @SettingsMergeObjectsFlags@ settings-ar-command = @SettingsArCommand@ settings-ranlib-command = @SettingsRanlibCommand@ settings-dll-wrap-command = @SettingsDllWrapCommand@ |