summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornelhage <nelhage>2007-09-19 23:49:52 +0000
committernelhage <nelhage>2007-09-19 23:49:52 +0000
commitd7a90d3b5c73e2f5698d1635812164c0cfee32dc (patch)
tree39b299b58f3b51cd47799d96d4aa092b571ef5ac
parent6197c042088bab45cb7d183e08032146b561f8b7 (diff)
downloadxv6-labs-d7a90d3b5c73e2f5698d1635812164c0cfee32dc.tar.gz
xv6-labs-d7a90d3b5c73e2f5698d1635812164c0cfee32dc.tar.bz2
xv6-labs-d7a90d3b5c73e2f5698d1635812164c0cfee32dc.zip
This should fix building on FreeBSD
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8caac2c..15fe43e 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ OBJDUMP = $(TOOLPREFIX)objdump
CFLAGS = -fno-builtin -O2 -Wall -MD -ggdb -m32
CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector)
ASFLAGS = -m32
-LDFLAGS = -m elf_i386
+# FreeBSD ld wants ``elf_i386_fbsd''
+LDFLAGS += -m $(shell $(LD) -V | grep elf_i386 2>/dev/null)
xv6.img: bootblock kernel fs.img
dd if=/dev/zero of=xv6.img count=10000