From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 3 Oct 2011 15:36:09 +0000 (+0100)
Subject: build: fix grep invocation in cc-options
X-Git-Tag: 4.0.3-rc3~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1b57ef21461c1c76612ce3902d6bd3ea312a8106;p=xen.git

build: fix grep invocation in cc-options

Currently the build produces lots of
        Usage: grep [OPTION]... PATTERN [FILE]...
        Try `grep --help' for more information.

This is due to the "grep -- $(2)" in cc-options. It seems that the
default of reading stdin is disabled when using "--". I don't know if
this is a bug in grep or how it is supposed to be but we can work
around it by explicitly passing in "-"

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Keir Fraser <keir@xen.org>
xen-unstable changeset:   23898:3d1664cc9e45
xen-unstable date:        Fri Sep 30 21:17:47 2011 +0100
---

diff --git a/Config.mk b/Config.mk
index ccab44742e..e2ede7430a 100644
--- a/Config.mk
+++ b/Config.mk
@@ -57,7 +57,7 @@ PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
 #
 # Usage: cflags-y += $(call cc-option,$(CC),-march=winchip-c6,-march=i586)
 cc-option = $(shell if test -z "`echo 'void*p=1;' | \
-              $(1) $(2) -S -o /dev/null -xc - 2>&1 | grep -- $(2)`"; \
+              $(1) $(2) -S -o /dev/null -xc - 2>&1 | grep -- $(2) -`"; \
               then echo "$(2)"; else echo "$(3)"; fi ;)
 
 # cc-option-add: Add an option to compilation flags, but only if supported.