summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-04-29 16:12:50 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2014-05-08 15:09:04 +0200
commit5a8b231e7ed39b25e141e8fbbde48203d2361cc2 (patch)
treebf492167fb6fd38392beaea061a518cc2cf98c9a
parent6b342cc9c872e82620fdd32730cd92affa8a19b3 (diff)
downloadfocaccia-qemu-5a8b231e7ed39b25e141e8fbbde48203d2361cc2.tar.gz
focaccia-qemu-5a8b231e7ed39b25e141e8fbbde48203d2361cc2.zip
build: Fix per-object variables for Makefile.target
The compiling is done in a subdir, so the extraction of per-object libs
and cflags are referencing objects with ../ prefixed. So prefix the
per-object variables "foo.o-cflags" and "foo.o-libs" to
"../foo.o-cflags" and "../foo.o-libs".

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--rules.mak1
1 files changed, 1 insertions, 0 deletions
diff --git a/rules.mak b/rules.mak
index 5c454d80d5..7038576282 100644
--- a/rules.mak
+++ b/rules.mak
@@ -228,6 +228,7 @@ endef
 define unnest-vars
 $(eval obj := $1)
 $(eval nested-vars := $2)
+$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(if $(obj),$(obj)/)))
 $(eval old-nested-dirs := )
 $(call unnest-vars-1)
 $(if $1,$(foreach v,$(nested-vars),$(eval \