fix HW=user build

085b8849 · Nickolai Zeldovich · bee92013 · 085b8849 · 085b8849 · 085b8849
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ NM = $(TOOLPREFIX)nm
 OBJCOPY = $(TOOLPREFIX)objcopy
 STRIP = $(TOOLPREFIX)strip

-INCLUDES  = -Iinclude -I$(QEMUSRC) -include param.h -include include/compiler.h
+INCLUDES  = -Iinclude -Istdinc -I$(QEMUSRC) -include param.h -include include/compiler.h
 COMFLAGS  = -static -g -MD -m64 -O3 -Wall -Werror -DHW_$(HW) -DXV6 \
 	    -fno-builtin -fno-strict-aliasing -fno-omit-frame-pointer -fms-extensions \
 	    -mno-sse -mcx16 -mno-red-zone $(INCLUDES)

--- a/include/stddef.h
+++ b/include/stddef.h
--- a/user/Makefrag.user
+++ b/user/Makefrag.user
-CXXFLAGS := -Iuser $(filter-out -nostdinc++, $(CXXFLAGS)) -msse
+CXXFLAGS := -Iuser $(filter-out -nostdinc++ -Istdinc, $(CXXFLAGS)) -msse

 $(O)/utest: $(O)/kernel/crange.o \
            $(O)/kernel/gc.o \