projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
On newer systems -ltinfo needs to be explicitly added to the link flags
[pintos-anon]
/
src
/
Make.config
diff --git
a/src/Make.config
b/src/Make.config
index 841e9104bbce9f3f881271ee0d643b75282d205b..14219b68ad462db8fdd16b01bfec577c5bb0912e 100644
(file)
--- a/
src/Make.config
+++ b/
src/Make.config
@@
-33,7
+33,7
@@
endif
# Compiler and assembler invocation.
DEFINES =
WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
# Compiler and assembler invocation.
DEFINES =
WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
-CFLAGS = -g -msoft-float -O
+CFLAGS = -g -msoft-float -O
-march=i686
CPPFLAGS = -nostdinc -I$(SRCDIR) -I$(SRCDIR)/lib
ASFLAGS = -Wa,--gstabs
LDFLAGS =
CPPFLAGS = -nostdinc -I$(SRCDIR) -I$(SRCDIR)/lib
ASFLAGS = -Wa,--gstabs
LDFLAGS =
@@
-44,6
+44,11
@@
ifeq ($(strip $(shell echo | $(CC) -fno-stack-protector -E - > /dev/null 2>&1; e
CFLAGS += -fno-stack-protector
endif
CFLAGS += -fno-stack-protector
endif
+# Turn off --build-id in the linker, which confuses the Pintos loader.
+ifeq ($(strip $(shell $(LD) --help | grep -q build-id; echo $$?)),0)
+LDFLAGS += -Wl,--build-id=none
+endif
+
%.o: %.c
$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES) $(DEPS)
%.o: %.c
$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES) $(DEPS)