diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-01-31 14:01:59 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-01-31 14:01:59 +0000 |
| commit | 77d293d88567d5150ca99c8d9e3e3c957e16484a (patch) | |
| tree | 437a6586619a468716c32c33bf2e5d34626ee9d5 /tools | |
| parent | 717a8c8a0a26fa07d57b1a68710848cd199a45ed (diff) | |
| download | xen-77d293d88567d5150ca99c8d9e3e3c957e16484a.tar.gz xen-77d293d88567d5150ca99c8d9e3e3c957e16484a.tar.bz2 xen-77d293d88567d5150ca99c8d9e3e3c957e16484a.zip | |
etherboot: Fix the build.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/firmware/etherboot/Makefile | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile index 503d9a22b4..67776afbd7 100644 --- a/tools/firmware/etherboot/Makefile +++ b/tools/firmware/etherboot/Makefile @@ -1,6 +1,10 @@ EB_VERSION=5.4.2 +override XEN_TARGET_ARCH = x86_32 +XEN_ROOT = ../../.. +include $(XEN_ROOT)/tools/Rules.mk + D=etherboot-$(EB_VERSION) T=etherboot-$(EB_VERSION).tar.gz E=etherboot-build @@ -18,7 +22,26 @@ $E/src/Config: $T Config rm -rf $D $E tar zxf $T cat Config >>$D/src/Config - ./find-gcc-3 >>$D/src/Config + @ + # override many of the settings in Config + echo ARCH=i386 >>$D/src/Config + echo "HOST_CC=$(HOSTCC)" >>$D/src/Config + echo "CPP=$(CPP)" >>$D/src/Config + echo "CC=$(CC)" >>$D/src/Config + echo "AS=$(CC) -c -x assembler -" >>$D/src/Config + echo "LD=$(LD)" >>$D/src/Config + echo "SIZE=$(SIZE)" >>$D/src/Config + echo "AR=$(AR)" >>$D/src/Config + echo "RANLIB=$(RANLIB)" >>$D/src/Config + echo "OBJCOPY=$(OBJCOPY)" >>$D/src/Config + echo "CFLAGS+=$(CFLAGS)" >>$D/src/Config + echo "ASFLAGS+=$(CFLAGS)" >>$D/src/Config + echo "LDFLAGS+=$(LDFLAGS_DIRECT)" >>$D/src/Config + @ + set -e; cd $D/src/arch/i386; \ + sed -e '/ifneq.*GCC_MINORVERSION/,/endif/ s/^/#/' \ + Config >Config.new; \ + mv Config.new Config mv $D $E clean: |