diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-03-28 12:08:01 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-04-04 03:33:58 -0400 |
| commit | 517ddff9b685d57475b63d73bab6bb623c24cd76 (patch) | |
| tree | 31bc9a42329f9a5c5eb8242f0d7185e6c53761d8 /hadrian | |
| parent | edbfea66d149a056640a5f7e358234171e67a4ee (diff) | |
| download | haskell-wip/object-merging-via-archives.tar.gz | |
Build ar archives with -L when "joining" objectswip/object-merging-via-archives
Since there may be .o files which are in fact archives.
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/bindist/Makefile | 1 | ||||
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index e9b1ce1cf7..bac7011a84 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -121,6 +121,7 @@ lib/settings : @echo ',("ar command", "$(SettingsArCommand)")' >> $@ @echo ',("ar flags", "$(ArArgs)")' >> $@ @echo ',("ar supports at file", "$(ArSupportsAtFile)")' >> $@ + @echo ',("ar supports -L", "$(ArSupportsDashL)")' >> $@ @echo ',("ranlib command", "$(SettingsRanlibCommand)")' >> $@ @echo ',("otool command", "$(SettingsOtoolCommand)")' >> $@ @echo ',("install_name_tool command", "$(SettingsInstallNameToolCommand)")' >> $@ diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index 9350b1b2ca..db220a98c4 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -311,6 +311,7 @@ generateSettings = do , ("ar command", expr $ settingsFileSetting SettingsFileSetting_ArCommand) , ("ar flags", expr $ lookupSystemConfig "ar-args") , ("ar supports at file", expr $ yesNo <$> flag ArSupportsAtFile) + , ("ar supports -L", expr $ yesNo <$> flag ArSupportsDashL) , ("ranlib command", expr $ settingsFileSetting SettingsFileSetting_RanlibCommand) , ("otool command", expr $ settingsFileSetting SettingsFileSetting_OtoolCommand) , ("install_name_tool command", expr $ settingsFileSetting SettingsFileSetting_InstallNameToolCommand) |