From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Tue, 24 Nov 2009 15:14:22 +0000 (+0000)
Subject: ioemu: fix compilation in corner cases.
X-Git-Url: http://xenbits.xen.org/gitweb?a=commitdiff_plain;h=099a4ebffcfc4807bc68e6b282325690765948b4;p=xenclient%2Fxen-pq.git

ioemu: fix compilation in corner cases.
---

diff --git a/master/fix_compilation b/master/fix_compilation
index 9a09543..4eadb84 100644
--- a/master/fix_compilation
+++ b/master/fix_compilation
@@ -1,5 +1,5 @@
 diff --git a/tools/Makefile b/tools/Makefile
-index 00e3981..11b71f1 100644
+index 00e3981..56f0c60 100644
 --- a/tools/Makefile
 +++ b/tools/Makefile
 @@ -2,16 +2,16 @@ XEN_ROOT = ../
@@ -43,16 +43,20 @@ index 00e3981..11b71f1 100644
  
  # For the sake of linking, set the sys-root
  ifneq ($(CROSS_COMPILE),)
-@@ -54,7 +54,7 @@ install: subdirs-install
+@@ -53,11 +53,9 @@ install: subdirs-install
+ .PHONY: clean distclean
  clean distclean: subdirs-clean
  
- ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
+-ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
 -IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
 +IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH:x86_32=i386) \
  			 --cross-prefix=$(CROSS_COMPILE) \
  			 --interp-prefix=$(CROSS_SYS_ROOT)
- endif
-@@ -69,26 +69,6 @@ subdir-clean-ioemu:
+-endif
+ 
+ ioemu/config-host.mak:
+ 	cd ioemu && XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) sh configure \
+@@ -69,26 +67,6 @@ subdir-clean-ioemu:
  	$(MAKE) -C ioemu distclean
  
  ioemu-dir-find: