X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMake.config;fp=src%2FMake.config;h=f9822b66d468f3198b504056f538bbb8b09b08bb;hb=c146dcf5f0ee9bcb1b44bfecacb919c0fa179e15;hp=8744f0da4a764c4022f72669668a498f271c6bea;hpb=e8986e1729370576db361326023de72df746f848;p=pintos-anon

diff --git a/src/Make.config b/src/Make.config
index 8744f0d..f9822b6 100644
--- a/src/Make.config
+++ b/src/Make.config
@@ -18,11 +18,21 @@ LD = i386-elf-ld
 OBJCOPY = i386-elf-objcopy
 endif
 
+# GCC 3.3 specifies directories for #include <> as "-I- -Idir"
+# GCC 4.x specifies directories for #include <> as "-isystem dir"
+# Figure out which format to use.
+ifeq (0, $(shell $(CC) -v 2>&1 | grep 'gcc version 4' >/dev/null 2>&1; echo $$?))
+SYSINCFLAGS = $(patsubst %,-isystem %,$(SYSINCDIRS))
+else
+SYSINCFLAGS = -I- $(patsubst %,-I%,$(SYSINCDIRS))
+endif
+
 # Compiler and assembler invocation.
 DEFINES =
 WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
 CFLAGS = -g -MMD -msoft-float -masm=intel
-CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib
+SYSINCDIRS = $(SRCDIR)/lib
+CPPFLAGS = -nostdinc -I$(SRCDIR) $(SYSINCFLAGS)
 ASFLAGS = -Wa,--gstabs -MMD
 LDFLAGS =