diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-08-16 12:31:40 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-08-18 18:37:57 -0400 |
| commit | 989b844d7598fd71ffd76e00d8d1f5207d58fd61 (patch) | |
| tree | 23883de9c049daf5bc32a95131d291c3309e96c6 /hadrian | |
| parent | 714c936fa31d83cb46b52d1dd920081474793a71 (diff) | |
| download | haskell-989b844d7598fd71ffd76e00d8d1f5207d58fd61.tar.gz | |
compiler: Drop --build-id=none hack
Since 2011 the object-joining implementation has had a hack to pass
`--build-id=none` to `ld` when supported, seemingly to work around a
linker bug. This hack is now unnecessary and may break downstream users
who expect objects to have valid build-ids. Remove it.
Closes #22060.
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/bindist/Makefile | 1 | ||||
| -rw-r--r-- | hadrian/cfg/system.config.in | 1 | ||||
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index a62cdca797..33ec5ace3f 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -91,7 +91,6 @@ lib/settings : @echo ',("ld command", "$(SettingsLdCommand)")' >> $@ @echo ',("ld flags", "$(SettingsLdFlags)")' >> $@ @echo ',("ld supports compact unwind", "$(LdHasNoCompactUnwind)")' >> $@ - @echo ',("ld supports build-id", "$(LdHasBuildId)")' >> $@ @echo ',("ld supports filelist", "$(LdHasFilelist)")' >> $@ @echo ',("ld is GNU ld", "$(LdIsGNULd)")' >> $@ @echo ',("Merge objects command", "$(SettingsMergeObjectsCommand)")' >> $@ diff --git a/hadrian/cfg/system.config.in b/hadrian/cfg/system.config.in index 385279a435..f3a4e3f438 100644 --- a/hadrian/cfg/system.config.in +++ b/hadrian/cfg/system.config.in @@ -136,7 +136,6 @@ conf-merge-objects-args-stage3 = @MergeObjsArgs@ gcc-extra-via-c-opts = @GccExtraViaCOpts@ ld-has-no-compact-unwind = @LdHasNoCompactUnwind@ -ld-has-build-id = @LdHasBuildId@ ld-has-filelist = @LdHasFilelist@ ld-is-gnu-ld = @LdIsGNULd@ ar-args = @ArArgs@ diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index 8fcb8e4e00..88fb6d903e 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -311,7 +311,6 @@ generateSettings = do , ("ld command", expr $ settingsFileSetting SettingsFileSetting_LdCommand) , ("ld flags", expr $ settingsFileSetting SettingsFileSetting_LdFlags) , ("ld supports compact unwind", expr $ lookupSystemConfig "ld-has-no-compact-unwind") - , ("ld supports build-id", expr $ lookupSystemConfig "ld-has-build-id") , ("ld supports filelist", expr $ lookupSystemConfig "ld-has-filelist") , ("ld is GNU ld", expr $ lookupSystemConfig "ld-is-gnu-ld") , ("Merge objects command", expr $ settingsFileSetting SettingsFileSetting_MergeObjectsCommand) |