diff options
author | Fam Zheng <famz@redhat.com> | 2014-02-10 14:48:52 +0800 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-02-20 13:12:54 +0100 |
commit | ba1183da9a10b94611cad88c44a5c6df005f9b55 (patch) | |
tree | d9be4600b1301c9c2d39ae78aded3a464dff361e /configure | |
parent | 10f5bff622cad71645e22c027b77ac31e51008ef (diff) | |
download | qemu-ba1183da9a10b94611cad88c44a5c6df005f9b55.tar.gz qemu-ba1183da9a10b94611cad88c44a5c6df005f9b55.tar.bz2 qemu-ba1183da9a10b94611cad88c44a5c6df005f9b55.zip |
rules.mak: fix $(obj) to a real relative path
Makefile.target includes rule.mak and unnested common-obj-y, then prefix
them with '../', this will ignore object specific QEMU_CFLAGS in subdir
Makefile.objs:
$(obj)/curl.o: QEMU_CFLAGS += $(CURL_CFLAGS)
Because $(obj) here is './block', instead of '../block'. This doesn't
hurt compiling because we basically build all .o from top Makefile,
before entering Makefile.target, but it will affact arriving per-object
libs support.
The starting point of $(obj) is passed in as argument of unnest-vars, as
well as nested variables, so that different Makefiles can pass in a
right value.
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2360,6 +2360,7 @@ fi if $pkg_config --atleast-version=$glib_req_ver gthread-2.0; then glib_cflags=`$pkg_config --cflags gthread-2.0` glib_libs=`$pkg_config --libs gthread-2.0` + CFLAGS="$glib_cflags $CFLAGS" LIBS="$glib_libs $LIBS" libs_qga="$glib_libs $libs_qga" else |