X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMake.config;h=5cee541eb41dc780ec2936bfccee07ae4dcaf177;hb=ee87ee08ebb35df6c3f8e4b6f5c066bed072936c;hp=f9822b66d468f3198b504056f538bbb8b09b08bb;hpb=c146dcf5f0ee9bcb1b44bfecacb919c0fa179e15;p=pintos-anon diff --git a/src/Make.config b/src/Make.config index f9822b6..5cee541 100644 --- a/src/Make.config +++ b/src/Make.config @@ -18,21 +18,11 @@ 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 -SYSINCDIRS = $(SRCDIR)/lib -CPPFLAGS = -nostdinc -I$(SRCDIR) $(SYSINCFLAGS) +CPPFLAGS = -nostdinc -I$(SRCDIR) -isystem $(SRCDIR)/lib ASFLAGS = -Wa,--gstabs -MMD LDFLAGS =