diff options
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/ghc.mk | 2 | ||||
-rw-r--r-- | compiler/main/SysTools.hs | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 6cd774744d..69eff31330 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -110,8 +110,6 @@ endif @echo 'cGhcEnableTablesNextToCode = "$(GhcEnableTablesNextToCode)"' >> $@ @echo 'cLeadingUnderscore :: String' >> $@ @echo 'cLeadingUnderscore = "$(LeadingUnderscore)"' >> $@ - @echo 'cGHC_UNLIT_PGM :: String' >> $@ - @echo 'cGHC_UNLIT_PGM = "$(utils/unlit_dist_PROG)"' >> $@ @echo 'cLibFFI :: Bool' >> $@ ifeq "$(UseLibFFIForAdjustors)" "YES" @echo 'cLibFFI = True' >> $@ diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs index 5725896d6b..6eccdd7ec6 100644 --- a/compiler/main/SysTools.hs +++ b/compiler/main/SysTools.hs @@ -211,9 +211,9 @@ initSysTools top_dir ghc_usage_msg_path = installed "ghc-usage.txt" ghci_usage_msg_path = installed "ghci-usage.txt" - -- For all systems, unlit, split, mangle are GHC utilities - -- architecture-specific stuff is done when building Config.hs - unlit_path = libexec cGHC_UNLIT_PGM + -- For all systems, unlit, split, mangle are GHC utilities + -- architecture-specific stuff is done when building Config.hs + unlit_path <- getToolSetting "unlit command" windres_path <- getToolSetting "windres command" libtool_path <- getToolSetting "libtool command" |