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 /mk | |
| 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 'mk')
| -rw-r--r-- | mk/config.mk.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 4269dec785..77da4d86bd 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -500,6 +500,8 @@ SettingsCCompilerLinkFlags = @SettingsCCompilerLinkFlags@ SettingsCCompilerSupportsNoPie = @SettingsCCompilerSupportsNoPie@ SettingsLdCommand = @SettingsLdCommand@ SettingsLdFlags = @SettingsLdFlags@ +SettingsMergeObjectsCommand = @SettingsMergeObjectsCommand@ +SettingsMergeObjectsFlags = @SettingsMergeObjectsFlags@ SettingsArCommand = @SettingsArCommand@ SettingsRanlibCommand = @SettingsRanlibCommand@ SettingsDllWrapCommand = @SettingsDllWrapCommand@ @@ -733,7 +735,6 @@ HaveDtrace = @HaveDtrace@ USE_DTRACE = $(HaveDtrace) DTRACE = @DtraceCmd@ -LD_NO_GOLD = @LdNoGoldCmd@ LD = @LdCmd@ NM = @NmCmd@ AR = @ArCmd@ |