diff --git a/criu/Makefile b/criu/Makefile index c67b9b2cf..48688d8c1 100644 --- a/criu/Makefile +++ b/criu/Makefile @@ -21,7 +21,6 @@ ccflags-y += -iquote criu/include ccflags-y += -iquote include ccflags-y += -iquote images ccflags-y += -iquote criu/pie -ccflags-y += -iquote $(ARCH_DIR) ccflags-y += -iquote $(ARCH_DIR)/include ccflags-y += -iquote . ccflags-y += -I/usr/include/libnl3 diff --git a/criu/arch/aarch64/Makefile b/criu/arch/aarch64/Makefile index 4203e3de7..0dc635096 100644 --- a/criu/arch/aarch64/Makefile +++ b/criu/arch/aarch64/Makefile @@ -1,6 +1,5 @@ builtin-name := crtools.built-in.o -ccflags-y += -iquote $(obj) ccflags-y += -iquote $(obj)/include -iquote criu/include ccflags-y += -iquote include ccflags-y += $(COMPEL_UAPI_INCLUDES) diff --git a/criu/arch/arm/Makefile b/criu/arch/arm/Makefile index 07daec7d8..1b0bc56cb 100644 --- a/criu/arch/arm/Makefile +++ b/criu/arch/arm/Makefile @@ -1,6 +1,6 @@ builtin-name := crtools.built-in.o -ccflags-y += -iquote $(obj) -iquote $(obj)/include +ccflags-y += -iquote $(obj)/include ccflags-y += -iquote criu/include -iquote include ccflags-y += $(COMPEL_UAPI_INCLUDES) diff --git a/criu/arch/ppc64/Makefile b/criu/arch/ppc64/Makefile index 177ea3156..8148dc943 100644 --- a/criu/arch/ppc64/Makefile +++ b/criu/arch/ppc64/Makefile @@ -1,6 +1,6 @@ builtin-name := crtools.built-in.o -ccflags-y += -iquote $(obj) -iquote $(obj)/include +ccflags-y += -iquote $(obj)/include ccflags-y += -iquote criu/include -iquote include ccflags-y += $(COMPEL_UAPI_INCLUDES) diff --git a/criu/arch/x86/Makefile b/criu/arch/x86/Makefile index 0e1717c1d..9ff59942a 100644 --- a/criu/arch/x86/Makefile +++ b/criu/arch/x86/Makefile @@ -1,6 +1,6 @@ builtin-name := crtools.built-in.o -ccflags-y += -iquote $(obj) -iquote . -iquote $(obj)/include +ccflags-y += -iquote $(obj)/include ccflags-y += -iquote criu/include -iquote include ccflags-y += $(COMPEL_UAPI_INCLUDES) diff --git a/criu/pie/Makefile b/criu/pie/Makefile index ffaaf4c41..d8b3fbff8 100644 --- a/criu/pie/Makefile +++ b/criu/pie/Makefile @@ -19,9 +19,6 @@ endif # CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) CFLAGS := $(filter-out $(CFLAGS-ASAN),$(CFLAGS)) -CFLAGS += -iquote criu/arch/$(ARCH)/include -CFLAGS += -iquote criu/include -CFLAGS += -iquote include ccflags-y += $(COMPEL_UAPI_INCLUDES) ccflags-y += -DCR_NOGLIBC diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library index 7fe25965c..78da25de2 100644 --- a/criu/pie/Makefile.library +++ b/criu/pie/Makefile.library @@ -34,8 +34,6 @@ endif # applications, which is not the target of the # project. # -iquotes += -iquote $(ARCH_DIR)/include -iquotes += -iquote criu/include -iquote include CFLAGS := $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) $(iquotes) CFLAGS := $(filter-out $(CFLAGS-ASAN),$(CFLAGS))