ia64/xen-unstable

changeset 6488:48e94e358663

Cross-compilation fixes.
Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue Aug 30 13:15:20 2005 +0000 (2005-08-30)
parents 77af70556792
children 1f46fafb7221
files tools/Makefile tools/console/Makefile tools/examples/Makefile tools/xcs/Makefile tools/xcutils/Makefile tools/xenstat/Makefile
line diff
     1.1 --- a/tools/Makefile	Tue Aug 30 13:12:47 2005 +0000
     1.2 +++ b/tools/Makefile	Tue Aug 30 13:15:20 2005 +0000
     1.3 @@ -7,15 +7,19 @@ SUBDIRS += xenstore
     1.4  SUBDIRS += misc
     1.5  SUBDIRS += examples
     1.6  SUBDIRS += xentrace
     1.7 -SUBDIRS += python
     1.8  SUBDIRS += xcs
     1.9  SUBDIRS += xcutils
    1.10 -#SUBDIRS += pygrub
    1.11  SUBDIRS += firmware
    1.12  SUBDIRS += security
    1.13  SUBDIRS += console
    1.14  SUBDIRS += xenstat
    1.15  
    1.16 +# These don't cross-compile
    1.17 +ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
    1.18 +SUBDIRS += python
    1.19 +#SUBDIRS += pygrub
    1.20 +endif
    1.21 +
    1.22  .PHONY: all install clean check check_clean ioemu eioemuinstall ioemuclean
    1.23  
    1.24  all: check
     2.1 --- a/tools/console/Makefile	Tue Aug 30 13:12:47 2005 +0000
     2.2 +++ b/tools/console/Makefile	Tue Aug 30 13:15:20 2005 +0000
     2.3 @@ -9,8 +9,7 @@ INSTALL         = install
     2.4  INSTALL_PROG    = $(INSTALL) -m0755
     2.5  INSTALL_DIR     = $(INSTALL) -d -m0755
     2.6  
     2.7 -CC       = gcc
     2.8 -CFLAGS   = -Wall -Werror -g3
     2.9 +CFLAGS  += -Wall -Werror -g3
    2.10  
    2.11  CFLAGS  += -I $(XEN_XCS)
    2.12  CFLAGS  += -I $(XEN_LIBXC)
     3.1 --- a/tools/examples/Makefile	Tue Aug 30 13:12:47 2005 +0000
     3.2 +++ b/tools/examples/Makefile	Tue Aug 30 13:15:20 2005 +0000
     3.3 @@ -1,3 +1,6 @@
     3.4 +XEN_ROOT = ../../
     3.5 +include $(XEN_ROOT)/tools/Rules.mk
     3.6 +
     3.7  INSTALL		= install
     3.8  INSTALL_DIR	= $(INSTALL) -d -m0755
     3.9  INSTALL_PROG	= $(INSTALL) -m0755
     4.1 --- a/tools/xcs/Makefile	Tue Aug 30 13:12:47 2005 +0000
     4.2 +++ b/tools/xcs/Makefile	Tue Aug 30 13:15:20 2005 +0000
     4.3 @@ -10,8 +10,7 @@ INSTALL         = install
     4.4  INSTALL_PROG    = $(INSTALL) -m0755
     4.5  INSTALL_DIR     = $(INSTALL) -d -m0755
     4.6  
     4.7 -CC       = gcc
     4.8 -CFLAGS   = -Wall -Werror -g3 -D _XOPEN_SOURCE=600
     4.9 +CFLAGS   += -Wall -Werror -g3 -D _XOPEN_SOURCE=600
    4.10  
    4.11  CFLAGS  += -I $(XEN_XC)
    4.12  CFLAGS  += -I $(XEN_LIBXC)
     5.1 --- a/tools/xcutils/Makefile	Tue Aug 30 13:12:47 2005 +0000
     5.2 +++ b/tools/xcutils/Makefile	Tue Aug 30 13:15:20 2005 +0000
     5.3 @@ -19,8 +19,6 @@ PROGRAMS_INSTALL_DIR	= /usr/libexec/xen
     5.4  
     5.5  INCLUDES += -I $(XEN_LIBXC)
     5.6  
     5.7 -CC := gcc
     5.8 -
     5.9  CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
    5.10  CFLAGS += $(INCLUDES)
    5.11  
     6.1 --- a/tools/xenstat/Makefile	Tue Aug 30 13:12:47 2005 +0000
     6.2 +++ b/tools/xenstat/Makefile	Tue Aug 30 13:15:20 2005 +0000
     6.3 @@ -3,7 +3,11 @@ include $(XEN_ROOT)/tools/Rules.mk
     6.4  
     6.5  SUBDIRS :=
     6.6  SUBDIRS += libxenstat
     6.7 +
     6.8 +# This doesn't cross-compile (cross-compile environments rarely have curses)
     6.9 +ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
    6.10  SUBDIRS += xentop
    6.11 +endif
    6.12  
    6.13  .PHONY: all install clean
    6.14