Cross-compilation fixes.

Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>

diff --git a/tools/Makefile b/tools/Makefile
index e9a9d3c4829ffaa928d4197a45449d2dfff0b2c1..57b63ae5f4733a5b3b685d001c632d319d1ef9b3 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,15 +7,19 @@ SUBDIRS += xenstore
 SUBDIRS += misc
 SUBDIRS += examples
 SUBDIRS += xentrace
-SUBDIRS += python
 SUBDIRS += xcs
 SUBDIRS += xcutils
-#SUBDIRS += pygrub
 SUBDIRS += firmware
 SUBDIRS += security
 SUBDIRS += console
 SUBDIRS += xenstat
 
+# These don't cross-compile
+ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
+SUBDIRS += python
+#SUBDIRS += pygrub
+endif
+
 .PHONY: all install clean check check_clean ioemu eioemuinstall ioemuclean
 
 all: check

diff --git a/tools/console/Makefile b/tools/console/Makefile
index 35bac3aaf93be6ba9c3bf21c1b7e090975c4e6df..cd88497f5f793311ab358462ee9dd1c0f188358d 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -9,8 +9,7 @@ INSTALL         = install
 INSTALL_PROG    = $(INSTALL) -m0755
 INSTALL_DIR     = $(INSTALL) -d -m0755
 
-CC       = gcc
-CFLAGS   = -Wall -Werror -g3
+CFLAGS  += -Wall -Werror -g3
 
 CFLAGS  += -I $(XEN_XCS)
 CFLAGS  += -I $(XEN_LIBXC)

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 5513807d47e57a814633303488461d09f3582430..c196978f85349bcb76e9b5e924cdbc2d08e9af0e 100644 (file)
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -1,3 +1,6 @@
+XEN_ROOT = ../../
+include $(XEN_ROOT)/tools/Rules.mk
+
 INSTALL                = install
 INSTALL_DIR    = $(INSTALL) -d -m0755
 INSTALL_PROG   = $(INSTALL) -m0755

diff --git a/tools/xcs/Makefile b/tools/xcs/Makefile
index ad08e1c23d042445f6833ca579453facd999cb5c..46e875ffe618cbfd5dd49b96afc919a271de3052 100644 (file)
--- a/tools/xcs/Makefile
+++ b/tools/xcs/Makefile
@@ -10,8 +10,7 @@ INSTALL         = install
 INSTALL_PROG    = $(INSTALL) -m0755
 INSTALL_DIR     = $(INSTALL) -d -m0755
 
-CC       = gcc
-CFLAGS   = -Wall -Werror -g3 -D _XOPEN_SOURCE=600
+CFLAGS   += -Wall -Werror -g3 -D _XOPEN_SOURCE=600
 
 CFLAGS  += -I $(XEN_XC)
 CFLAGS  += -I $(XEN_LIBXC)

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 77343b71e85e31f028e28f1c90706fd28c99125d..2a0d13b4ce5647fb10ca7689c3711266e6db2b31 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -19,8 +19,6 @@ PROGRAMS_INSTALL_DIR  = /usr/libexec/xen
 
 INCLUDES += -I $(XEN_LIBXC)
 
-CC := gcc
-
 CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
 CFLAGS += $(INCLUDES)
 

diff --git a/tools/xenstat/Makefile b/tools/xenstat/Makefile
index 4caec1a6da9ab8b79ef4f132fde651cc95c50fe9..1daa628bcbca8158aa914a1038915597dcb2d694 100644 (file)
--- a/tools/xenstat/Makefile
+++ b/tools/xenstat/Makefile
@@ -3,7 +3,11 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS :=
 SUBDIRS += libxenstat
+
+# This doesn't cross-compile (cross-compile environments rarely have curses)
+ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
 SUBDIRS += xentop
+endif
 
 .PHONY: all install clean