diff options
| author | Thomas Monjalon <thomas_ml@monjalon.net> | 2009-09-11 18:45:40 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-05 09:32:53 -0500 |
| commit | dbbbdde14b78f44562f6d74ca26003ee32a95b0c (patch) | |
| tree | 13fac367a17007ef529c9636ce11980cd6bb151c /rules.mak | |
| parent | 01acb299a1612a47da2d2456811c7fa3c074a5e4 (diff) | |
| download | qemu-dbbbdde14b78f44562f6d74ca26003ee32a95b0c.tar.gz qemu-dbbbdde14b78f44562f6d74ca26003ee32a95b0c.tar.bz2 qemu-dbbbdde14b78f44562f6d74ca26003ee32a95b0c.zip | |
restore CFLAGS check for conflict and fix recursive CFLAGS issue
cc-option uses more make-syntax to replace the shell "if/else".
Issue with recursive += is fixed by doing the first assignment
simply-expanded, as explained in
http://www.gnu.org/software/make/manual/html_node/Appending.html
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'rules.mak')
| -rw-r--r-- | rules.mak | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -21,5 +21,5 @@ quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) # cc-option # Usage: CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0) -cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) +cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \ + >/dev/null 2>&1 && echo OK), $2, $3) |