xv6

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 092f2cbce7ae4b277fbc7f86e9eb0da272680bd2
parent c36c8960ba9d06ffb00a7d6e89d81ddf2d31f8ea
Author: Brian Swetland <swetland@frotz.net>
Date:   Fri, 27 Dec 2013 10:12:52 -0800

make build on ubuntu 13.10

Diffstat:
MMakefile | 6++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile @@ -67,6 +67,8 @@ QEMU = $(shell if which qemu > /dev/null; \ echo "***" 1>&2; exit 1) endif +XFLAGS = -I/usr/include/x86_64-linux-gnu + CC = $(TOOLPREFIX)gcc AS = $(TOOLPREFIX)gas LD = $(TOOLPREFIX)ld @@ -75,9 +77,9 @@ OBJDUMP = $(TOOLPREFIX)objdump #CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb -m32 -Werror -fno-omit-frame-pointer CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -MD -ggdb -m32 -Werror -fno-omit-frame-pointer CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector) -CFLAGS += -Iinclude +CFLAGS += -Iinclude $(XFLAGS) ASFLAGS = -m32 -gdwarf-2 -Wa,-divide -ASFLAGS += -Iinclude +ASFLAGS += -Iinclude $(XFLAGS) # FreeBSD ld wants ``elf_i386_fbsd'' LDFLAGS += -m $(shell $(LD) -V | grep elf_i386 2>/dev/null)