[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/10] build: Fix per-object variables for Makefile.t
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 01/10] build: Fix per-object variables for Makefile.target |
Date: |
Fri, 9 May 2014 23:03:35 +0200 |
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 <address@hidden>
Reviewed-by: Michael Tokarev <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
rules.mak | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules.mak b/rules.mak
index 5c454d8..7038576 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 \
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] Build system changes for 2014-05-09, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 02/10] build: simplify Makefile.target a bit, use just one rule for softmmu, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 01/10] build: Fix per-object variables for Makefile.target,
Paolo Bonzini <=
- [Qemu-devel] [PULL 04/10] Makefile: strip tools and modules too, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 05/10] Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL), Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 06/10] Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG), Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 07/10] build: add support for per-object -cflags and -libs to all rules, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 03/10] build: simplify Makefile.target around unnest-vars invocations, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 08/10] build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 10/10] libcacard: remove libcacard-specific CFLAGS and LIBS from global vars, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 09/10] build: simplify and fix fix-obj-vars, Paolo Bonzini, 2014/05/09
- Re: [Qemu-devel] [PULL 00/10] Build system changes for 2014-05-09, Peter Maydell, 2014/05/13