aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-10-03 16:33:29 +0100
committerIan Campbell <ian.campbell@citrix.com>2011-10-03 16:33:29 +0100
commit1db9edb835c4045e75f46fbad66408d170616574 (patch)
treebdf1fdfc0e525ed0e4a8ecc4e58b6ab3bf621677
parent9ceb2a1deda4da3452bcd0f40ba3edac73d023d8 (diff)
downloadxen-1db9edb835c4045e75f46fbad66408d170616574.tar.gz
xen-1db9edb835c4045e75f46fbad66408d170616574.tar.bz2
xen-1db9edb835c4045e75f46fbad66408d170616574.zip
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
-rw-r--r--Config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Config.mk b/Config.mk
index 07ce7b3fde..62d3b0e448 100644
--- a/Config.mk
+++ b/Config.mk
@@ -73,7 +73,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.