From 3e401d7b2fe29713c11824542422fdce93f4890c Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 23 Apr 2011 21:43:25 +0100 Subject: [PATCH] Rename "GCC command" to "C compiler command" Makes it consistent with the existing "C compiler flags" field. --- compiler/main/SysTools.lhs | 2 +- configure.ac | 2 +- settings.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs index 656ece1..2529dbf 100644 --- a/compiler/main/SysTools.lhs +++ b/compiler/main/SysTools.lhs @@ -181,7 +181,7 @@ initSysTools mbMinusB -- with the settings file, but it would be a little fiddly -- to make that possible, so for now you can't. ; gcc_prog <- if isWindowsHost then return $ installed_mingw_bin "gcc" - else getSetting "GCC command" + else getSetting "C compiler command" ; perl_path <- if isWindowsHost then return $ installed_perl_bin "perl" else getSetting "perl command" diff --git a/configure.ac b/configure.ac index b126d1e..9278126 100644 --- a/configure.ac +++ b/configure.ac @@ -133,7 +133,7 @@ if test "$WithGhc" != ""; then if test $GhcCanonVersion -ge 613; then ghc_ge_613=YES; else ghc_ge_613=NO; fi AC_SUBST(ghc_ge_613)dnl - BOOTSTRAPPING_GHC_INFO_FIELD([CC_STAGE0],[GCC command],['$(CC)']) + BOOTSTRAPPING_GHC_INFO_FIELD([CC_STAGE0],[C compiler command],['$(CC)']) fi dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on diff --git a/settings.in b/settings.in index 0c1c87a..5227345 100644 --- a/settings.in +++ b/settings.in @@ -1,4 +1,4 @@ [("GCC extra via C opts", "@GccExtraViaCOpts@"), - ("GCC command", "@WhatGccIsCalled@"), + ("C compiler command", "@WhatGccIsCalled@"), ("perl command", "@WhatGccIsCalled@")] -- 1.7.10.4