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

diff --git a/src/Make.config b/src/Make.config
index 16db6d5..40feba6 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) --help | grep -q build-id; echo $$?)),0)
+LDFLAGS += -Wl,--build-id=none
+endif
+
 %.o: %.c
 	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES) $(DEPS)