[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xen-cvs
Subject:    [Xen-changelog] [xen master] stubdom/Makefile: use QEMU_TRADITIONAL_LOC
From:       patchbot () xen ! org
Date:       2014-10-30 9:14:38
Message-ID: E1XjloU-0000cW-O5 () xenbits ! xen ! org
[Download RAW message or body]

commit 37284698cd64cd71ecc4b354196904a9d0c40bb2
Author:     M A Young <m.a.young@durham.ac.uk>
AuthorDate: Thu Oct 23 18:37:43 2014 +0100
Commit:     Ian Jackson <Ian.Jackson@eu.citrix.com>
CommitDate: Fri Oct 24 16:19:26 2014 +0100

    stubdom/Makefile: use QEMU_TRADITIONAL_LOC
    
    In commit 8962a8f951ea83e8d10ee23aeb20266e4795b06e CONFIG_QEMU was
    replaced by QEMU_TRADITIONAL_LOC. However stubdom/Makefile still uses
    CONFIG_QEMU so building stubdom is likely to fail.  This patch
    replaces CONFIG_QEMU with QEMU_TRADITIONAL_LOC in stubdom/Makefile as
    well.
    
    Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
    Acked-by: Wei Liu <wei.liu2@citrix.com>
    Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 stubdom/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/stubdom/Makefile b/stubdom/Makefile
index 2f9ca52..8fb885a 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -263,7 +263,7 @@ $(OCAML_STAMPFILE): ocaml-$(XEN_TARGET_ARCH)/.dirstamp
 .PHONY: $(CROSS_ROOT)
 $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci
 
-QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else \
echo .; fi) +QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo \
"$(QEMU_TRADITIONAL_LOC)"; else echo .; fi)  
 ifneq ($(filter ioemu,$(STUBDOM_TARGETS)),)
 IOEMU_LINKFARM_TARGET := ioemu/linkfarm.stamp
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xen.org
http://lists.xensource.com/xen-changelog


[prev in list] [next in list] [prev in thread] [next in thread]