[Xen-changelog] [xen-unstable] Make tools/Makefile cross-friendly

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1200995033 0
# Node ID 5b9b3b41fe89ce89ddbd2392d8ec0e63e97be23c
# Parent  6fed70d658ea735fc18d89c7e46951114be5e584
Make tools/Makefile cross-friendly

Pass Xen cross-compilation options through to ioemu.
Export CROSS_SYS_ROOT for use by scripts.  Unexport
IOEMU_DIR since it isn't used outside of the Makefile.

Signed-off-by: Aron Griffis <aron@xxxxxx>
---
 tools/Makefile |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff -r 6fed70d658ea -r 5b9b3b41fe89 tools/Makefile
--- a/tools/Makefile    Mon Jan 21 14:39:33 2008 +0000
+++ b/tools/Makefile    Tue Jan 22 09:43:53 2008 +0000
@@ -26,6 +26,12 @@ ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_A
 ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
 SUBDIRS-$(PYTHON_TOOLS) += python
 SUBDIRS-$(PYTHON_TOOLS) += pygrub
+endif
+
+# For the sake of linking, set the sys-root
+ifneq ($(CROSS_COMPILE),)
+CROSS_SYS_ROOT ?= /usr/$(CROSS_COMPILE:-=)/sys-root
+export CROSS_SYS_ROOT
 endif
 
 .PHONY: all
@@ -65,10 +71,15 @@ check_clean:
 
 .PHONY: ioemu ioemuinstall ioemuclean
 ifeq ($(CONFIG_IOEMU),y)
-export IOEMU_DIR ?= ioemu
+IOEMU_DIR ?= ioemu
+ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
+IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \
+                        --interp-prefix=$(CROSS_SYS_ROOT)
+endif
 ioemu ioemuinstall:
        [ -f $(IOEMU_DIR)/config-host.mak ] || \
-         (cd $(IOEMU_DIR) && sh configure --prefix=/usr)
+         ( cd $(IOEMU_DIR) && sh configure --prefix=/usr \
+               $(IOEMU_CONFIGURE_CROSS) )
        $(MAKE) -C $(IOEMU_DIR) $(patsubst ioemu%,%,$@)
 ioemuclean:
        $(MAKE) -C $(IOEMU_DIR) distclean

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