From ac0732ff36280b99f53a30ee6ecf0ce2e5eee60a Mon Sep 17 00:00:00 2001
From: Ben Gamari <bgamari.foss@gmail.com>
Date: Tue, 9 Feb 2016 11:06:27 +0100
Subject: [PATCH] Unset GREP_OPTIONS in build system
Test Plan: GREP_OPTIONS=--blah ./validate
Reviewers: austin, thomie
Reviewed By: thomie
Differential Revision: https://phabricator.haskell.org/D1887
GHC Trac Issues: #11530
(cherry picked from commit bfec4a6aade005b6dbd170645d4f2d062cee1d92)
---
Makefile | 7 +++++++
boot | 3 +++
ghc.mk | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 6be584f5361..82ab2f78f6b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,13 @@
MAKEFLAGS += --no-builtin-rules
.SUFFIXES:
+
+# -----------------------------------------------------------------------------
+# Sanitize environment
+
+# See Trac #11530
+export GREP_OPTIONS :=
+
ifneq "$(filter maintainer-clean distclean clean clean_% help,$(MAKECMDGOALS))" ""
-include mk/config.mk
else
diff --git a/boot b/boot
index 18d43aabda0..45f5bf06c24 100755
--- a/boot
+++ b/boot
@@ -11,6 +11,9 @@ my %required_tag;
my $validate;
my $curdir;
+# See Trac #11530
+$ENV{GREP_OPTIONS} = '';
+
$required_tag{"-"} = 1;
$validate = 0;
diff --git a/ghc.mk b/ghc.mk
index cbac891b3c2..5e4ecc6e13f 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -92,7 +92,7 @@ $(error Your make does not support abspath. You need GNU make >= 3.81)
endif
##################################################
-
+# -----------------------------------------------------------------------------
# Catch make if it runs away into an infinite loop
ifeq "$(MAKE_RESTARTS)" ""
else ifeq "$(MAKE_RESTARTS)" "1"
--
GitLab