diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-03-29 12:26:50 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-04-25 10:19:29 -0400 |
| commit | 9420d26b4b9dd42238d3ec2a92abe0552d37775e (patch) | |
| tree | 83ab1953b68e9a6bf17dfcdefe66894411d1a197 /hadrian | |
| parent | cb71226f9537e542c6eadb90d8006e525c941605 (diff) | |
| download | haskell-9420d26b4b9dd42238d3ec2a92abe0552d37775e.tar.gz | |
Drop libtool path from settings file
GHC no longers uses libtool for linking and therefore this is no longer
necessary.
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/Oracles/Setting.hs | 2 | ||||
| -rw-r--r-- | hadrian/src/Rules/Generate.hs | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index d4e52f8c65..5290a5e9df 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -128,7 +128,6 @@ lib/settings : @echo ',("touch command", "$(SettingsTouchCommand)")' >> $@ @echo ',("dllwrap command", "$(SettingsDllWrapCommand)")' >> $@ @echo ',("windres command", "$(SettingsWindresCommand)")' >> $@ - @echo ',("libtool command", "$(SettingsLibtoolCommand)")' >> $@ @echo ',("unlit command", "$$topdir/bin/unlit")' >> $@ @echo ',("cross compiling", "$(CrossCompiling)")' >> $@ @echo ',("target platform string", "$(TARGETPLATFORM)")' >> $@ diff --git a/hadrian/cfg/system.config.in b/hadrian/cfg/system.config.in index 6544261cd3..ddb6f54cb6 100644 --- a/hadrian/cfg/system.config.in +++ b/hadrian/cfg/system.config.in @@ -159,7 +159,6 @@ settings-otool-command = @SettingsOtoolCommand@ settings-install_name_tool-command = @SettingsInstallNameToolCommand@ settings-dll-wrap-command = @SettingsDllWrapCommand@ settings-windres-command = @SettingsWindresCommand@ -settings-libtool-command = @SettingsLibtoolCommand@ settings-touch-command = @SettingsTouchCommand@ settings-clang-command = @SettingsClangCommand@ settings-llc-command = @SettingsLlcCommand@ diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs index 72f67941ae..6ce01327c5 100644 --- a/hadrian/src/Oracles/Setting.hs +++ b/hadrian/src/Oracles/Setting.hs @@ -122,7 +122,6 @@ data SettingsFileSetting | SettingsFileSetting_InstallNameToolCommand | SettingsFileSetting_DllWrapCommand | SettingsFileSetting_WindresCommand - | SettingsFileSetting_LibtoolCommand | SettingsFileSetting_TouchCommand | SettingsFileSetting_ClangCommand | SettingsFileSetting_LlcCommand @@ -215,7 +214,6 @@ settingsFileSetting key = lookupSystemConfig $ case key of SettingsFileSetting_InstallNameToolCommand -> "settings-install_name_tool-command" SettingsFileSetting_DllWrapCommand -> "settings-dll-wrap-command" SettingsFileSetting_WindresCommand -> "settings-windres-command" - SettingsFileSetting_LibtoolCommand -> "settings-libtool-command" SettingsFileSetting_TouchCommand -> "settings-touch-command" SettingsFileSetting_ClangCommand -> "settings-clang-command" SettingsFileSetting_LlcCommand -> "settings-llc-command" diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs index 912618662e..aaa83e0060 100644 --- a/hadrian/src/Rules/Generate.hs +++ b/hadrian/src/Rules/Generate.hs @@ -319,7 +319,6 @@ generateSettings = do , ("touch command", expr $ settingsFileSetting SettingsFileSetting_TouchCommand) , ("dllwrap command", expr $ settingsFileSetting SettingsFileSetting_DllWrapCommand) , ("windres command", expr $ settingsFileSetting SettingsFileSetting_WindresCommand) - , ("libtool command", expr $ settingsFileSetting SettingsFileSetting_LibtoolCommand) , ("unlit command", ("$topdir/bin/" <>) <$> expr (programName (ctx { Context.package = unlit }))) , ("cross compiling", expr $ yesNo <$> flag CrossCompiling) , ("target platform string", getSetting TargetPlatform) |