X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMake.config;h=3279301160d7462aa3017c011a76a920189200db;hb=43dadfe13b843be54ac5fdc9e4496beb47af3b1f;hp=16db6d5271a25cc4dcb11373ae088be2653e722f;hpb=2886710fa362574f5ce483ee9c8e573ab3afc000;p=pintos-anon

diff --git a/src/Make.config b/src/Make.config
index 16db6d5..3279301 100644
--- a/src/Make.config
+++ b/src/Make.config
@@ -39,6 +39,16 @@ ASFLAGS = -Wa,--gstabs
 LDFLAGS = 
 DEPS = -MMD -MF $(@:.o=.d)
 
+# Turn off -fstack-protector, which we don't support.
+ifeq ($(strip $(shell echo | $(CC) -fno-stack-protector -E - > /dev/null 2>&1; echo $$?)),0)
+CFLAGS += -fno-stack-protector
+endif
+
+# Turn off --build-id in the linker, which confuses the Pintos loader.
+ifeq ($(strip $(shell $(LD) --build-id=none -e 0 /dev/null -o /dev/null 2>&1; echo $$?)),0)
+LDFLAGS += -Wl,--build-id=none
+endif
+
 %.o: %.c
 	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES) $(DEPS)