Skip to content

X
xv6-public
提交 91fd3470 创建 作者: Icenowy Zheng's avatar Icenowy Zheng 提交者： Frans Kaashoek
浏览文件
操作

Fixed broken build on newer gold linker with NaCl support

On platforms with NaCl support, ld.gold -V will return a "elf_i386_nacl" in addition to "elf_i386", which will make the build fail.
上级 907f23a5
隐藏空白字符变更
内嵌 并排
正在显示 包含 1 行增加 和 1 行删除
Makefile
浏览文件 @ 91fd3470
...@@ -80,7 +80,7 @@ CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb ...@@ -80,7 +80,7 @@ CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb
CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector) CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector)
ASFLAGS = -m32 -gdwarf-2 -Wa,-divide ASFLAGS = -m32 -gdwarf-2 -Wa,-divide
# FreeBSD ld wants ``elf_i386_fbsd'' # FreeBSD ld wants ``elf_i386_fbsd''
LDFLAGS += -m $(shell $(LD) -V | grep elf_i386 2>/dev/null) LDFLAGS += -m $(shell $(LD) -V | grep elf_i386 2>/dev/null | head -n 1)
xv6.img: bootblock kernel fs.img xv6.img: bootblock kernel fs.img
dd if=/dev/zero of=xv6.img count=10000 dd if=/dev/zero of=xv6.img count=10000
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论