[Xen-changelog] Cross-compilation fixes.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 48e94e3586636152f4830630a5973898a339a734
# Parent  77af705567921f3336ed78ef601af8cf64be9138
Cross-compilation fixes.
Signed-off-by: Michal Ostrowski <mostrows@xxxxxxxxxxxxxx>

diff -r 77af70556792 -r 48e94e358663 tools/Makefile
--- a/tools/Makefile    Tue Aug 30 13:12:47 2005
+++ b/tools/Makefile    Tue Aug 30 13:15:20 2005
@@ -7,14 +7,18 @@
 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
 
diff -r 77af70556792 -r 48e94e358663 tools/console/Makefile
--- a/tools/console/Makefile    Tue Aug 30 13:12:47 2005
+++ b/tools/console/Makefile    Tue Aug 30 13:15:20 2005
@@ -9,8 +9,7 @@
 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 -r 77af70556792 -r 48e94e358663 tools/examples/Makefile
--- a/tools/examples/Makefile   Tue Aug 30 13:12:47 2005
+++ b/tools/examples/Makefile   Tue Aug 30 13:15:20 2005
@@ -1,3 +1,6 @@
+XEN_ROOT = ../../
+include $(XEN_ROOT)/tools/Rules.mk
+
 INSTALL                = install
 INSTALL_DIR    = $(INSTALL) -d -m0755
 INSTALL_PROG   = $(INSTALL) -m0755
diff -r 77af70556792 -r 48e94e358663 tools/xcs/Makefile
--- a/tools/xcs/Makefile        Tue Aug 30 13:12:47 2005
+++ b/tools/xcs/Makefile        Tue Aug 30 13:15:20 2005
@@ -10,8 +10,7 @@
 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 -r 77af70556792 -r 48e94e358663 tools/xcutils/Makefile
--- a/tools/xcutils/Makefile    Tue Aug 30 13:12:47 2005
+++ b/tools/xcutils/Makefile    Tue Aug 30 13:15:20 2005
@@ -18,8 +18,6 @@
 PROGRAMS_INSTALL_DIR   = /usr/libexec/xen
 
 INCLUDES += -I $(XEN_LIBXC)
-
-CC := gcc
 
 CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
 CFLAGS += $(INCLUDES)
diff -r 77af70556792 -r 48e94e358663 tools/xenstat/Makefile
--- a/tools/xenstat/Makefile    Tue Aug 30 13:12:47 2005
+++ b/tools/xenstat/Makefile    Tue Aug 30 13:15:20 2005
@@ -3,7 +3,11 @@
 
 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
 

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