[commit: ghc] wip/nfs-locking: Drop support for old configure.ac. (0b0996b)

[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/0b0996b12437a70eeeac0739b493ed505b2c8b89/ghc

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

commit 0b0996b12437a70eeeac0739b493ed505b2c8b89
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Feb 10 12:45:40 2016 +0000

    Drop support for old configure.ac.


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

0b0996b12437a70eeeac0739b493ed505b2c8b89
 src/Rules/Actions.hs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/Rules/Actions.hs b/src/Rules/Actions.hs
index d81b838..f8f4925 100644
--- a/src/Rules/Actions.hs
+++ b/src/Rules/Actions.hs
@@ -6,7 +6,6 @@ module Rules.Actions (
     ) where
 
 import qualified System.Directory as IO
-import System.Console.ANSI
 
 import Base
 import CmdLineFlag
@@ -127,20 +126,11 @@ runMakeWithVerbosity :: Bool -> FilePath -> [String] -> Action ()
 runMakeWithVerbosity verbose dir args = do
     need [dir -/- "Makefile"]
     path <- builderPath Make
-
-    -- FIXME: temporary safety net for those who are not on GHC HEAD, see #167
-    -- TODO: add need [path] once lookupInPath is enabled on Windows
-    fixPath <- if path == "@MakeCmd@" <.> exe
-               then do
-                   putColoured Red $ "You are behind GHC HEAD, make autodetection is disabled."
-                   return "make"
-               else return path
-
     let note = if null args then "" else " (" ++ intercalate ", " args ++ ")"
-    putBuild $ "| Run " ++ fixPath ++ note ++ " in " ++ dir ++ "..."
+    putBuild $ "| Run make" ++ note ++ " in " ++ dir ++ "..."
     if verbose
-    then           cmd Shell                    fixPath ["-C", dir] args
-    else quietly $ cmd Shell (EchoStdout False) fixPath ["-C", dir] args
+    then           cmd Shell                    path ["-C", dir] args
+    else quietly $ cmd Shell (EchoStdout False) path ["-C", dir] args
 
 applyPatch :: FilePath -> FilePath -> Action ()
 applyPatch dir patch = do