From 7fc192e9a5d517f48561243d24a5e0a88cdd0805 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 31 Jul 2010 22:32:21 +0000 Subject: [PATCH] fix for GREP_OPTIONS When using GREP_OPTIONS to supply default options to grep, the buildsystem might get broken (For example adding --color=always breaks it) This patch will empty the GREP_OPTIONS to prevent the described (and any other) problems related to GREP_OPTIONS Signed-off-by: Maarten Bezemer SVN-Revision: 22443 --- Makefile | 2 ++ rules.mk | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Makefile b/Makefile index db79274c9a..31042b2e09 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,8 @@ ifneq ($(OPENWRT_BUILD),1) override OPENWRT_BUILD=1 export OPENWRT_BUILD + GREP_OPTIONS= + export GREP_OPTIONS include $(TOPDIR)/include/debug.mk include $(TOPDIR)/include/depends.mk include $(TOPDIR)/include/toplevel.mk diff --git a/rules.mk b/rules.mk index 0cb72ac6bc..2add087133 100644 --- a/rules.mk +++ b/rules.mk @@ -18,6 +18,9 @@ TMP_DIR:=$(TOPDIR)/tmp export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' -- +GREP_OPTIONS= +export GREP_OPTIONS + qstrip=$(strip $(subst ",,$(1))) #")) -- 2.30.2