[commit: ghc] wip/nfs-locking: Allow users to choose which 'make' to use. (43d5847)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/43d5847155ff33dd67929164d49358fc82985944/ghc

>---------------------------------------------------------------

commit 43d5847155ff33dd67929164d49358fc82985944
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 12 18:12:14 2016 +0000

    Allow users to choose which 'make' to use.
    
    Fix #157. [skip ci]


>---------------------------------------------------------------

43d5847155ff33dd67929164d49358fc82985944
 src/Rules/Actions.hs | 2 +-
 src/Settings/User.hs | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Rules/Actions.hs b/src/Rules/Actions.hs
index 338bec3..0600d82 100644
--- a/src/Rules/Actions.hs
+++ b/src/Rules/Actions.hs
@@ -105,7 +105,7 @@ runMake dir args = do
     need [dir -/- "Makefile"]
     let note = if null args then "" else " (" ++ intercalate ", " args ++ ")"
     putBuild $ "| Run make" ++ note ++ " in " ++ dir ++ "..."
-    quietly $ cmd Shell (EchoStdout False) "make" ["-C", dir] args
+    quietly $ cmd Shell (EchoStdout False) makeCommand ["-C", dir] args
 
 runBuilder :: Builder -> [String] -> Action ()
 runBuilder builder args = do
diff --git a/src/Settings/User.hs b/src/Settings/User.hs
index 3cebe13..3d08ecd 100644
--- a/src/Settings/User.hs
+++ b/src/Settings/User.hs
@@ -3,7 +3,7 @@ module Settings.User (
     userArgs, userPackages, userLibWays, userRtsWays, userKnownPackages,
     integerLibrary, buildHaddock, validating, ghciWithDebugger, ghcProfiled,
     ghcDebugged, dynamicGhcPrograms, laxDependencies, buildSystemConfigFile,
-    verboseCommands, turnWarningsIntoErrors, splitObjects
+    verboseCommands, turnWarningsIntoErrors, splitObjects, makeCommand
     ) where
 
 import GHC
@@ -101,3 +101,8 @@ verboseCommands = return False
 -- | To enable -Werror in Stage2 set turnWarningsIntoErrors = stage2.
 turnWarningsIntoErrors :: Predicate
 turnWarningsIntoErrors = return False
+
+-- | Specify which @make@ command to use, for example set to "gmake" for
+-- @GNU make at .
+makeCommand :: FilePath
+makeCommand = "make"