diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-04-21 08:36:33 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-04-21 08:36:33 +0100 |
| commit | 2a3a5fca3f2765950472452867aba1786fc82820 (patch) | |
| tree | 828282e6e80e6ddcaa0fc587017a2cbc03b8231a | |
| parent | 9d31d53cb374a82e564756736c2cb973663afddc (diff) | |
| download | xen-2a3a5fca3f2765950472452867aba1786fc82820.tar.gz xen-2a3a5fca3f2765950472452867aba1786fc82820.tar.bz2 xen-2a3a5fca3f2765950472452867aba1786fc82820.zip | |
xen: build fix GNU sed vs. BSD sed
Fixes the build error below:
gmake[5]: Entering directory `xen/arch/x86/boot'
gcc -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -m32
-march=3Di686 -g -fno-strict-aliasing -std=3Dgnu99 -Wall
-Wstrict-prototypes
-Wno-unused-value -Wdeclaration-after-statement -fno-stack-protector
-Werror -fno-builtin -msoft-float -c reloc.c -o reloc.o
ld -melf_i386 -N -Ttext -o reloc.lnk reloc.o
ld: invalid hex number `-o'
BSD sed does not support the '+' in the basic re while gnu sed does.
BSD sed supports '+' in the extended re and uses the -E flag while
gnu sed uses -r.
The only difference with the original version is that the '+'
qualifier is replaced with '\{1\,\}' which should work with both BSD
sed and GNU sed.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
xen-unstable changeset: 21210:b36467432eff
xen-unstable date: Wed Apr 21 08:30:45 2010 +0100
| -rw-r--r-- | xen/arch/x86/boot/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index 630b19d027..c90b819555 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -2,7 +2,7 @@ obj-y += head.o head.o: reloc.S -BOOT_TRAMPOLINE := $(shell sed -n 's,^\#define[[:space:]]\+BOOT_TRAMPOLINE[[:space:]]\+,,p' $(BASEDIR)/include/asm-x86/config.h) +BOOT_TRAMPOLINE := $(shell sed -n 's,^\#define[[:space:]]\{1\,\}BOOT_TRAMPOLINE[[:space:]]\{1\,\},,p' $(BASEDIR)/include/asm-x86/config.h) %.S: %.c RELOC=$(BOOT_TRAMPOLINE) XEN_BITSPERLONG=$(patsubst x86_%,%,$(TARGET_SUBARCH)) $(MAKE) -f build32.mk $@ |