Makefile: refine include path for efi_stub

Move hypervisor related include path from CFLAGS to INCLUDE_PATH to make
structure more clean.

Tracked-On: #3779

Signed-off-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Victor Sun 2019-10-24 16:42:42 +08:00 committed by wenlingz
parent bb3befa306
commit 0011607a16
1 changed files with 8 additions and 3 deletions

View File

@ -32,9 +32,15 @@
HV_OBJDIR:=build
HV_FILE:=acrn
HV_SRC:=../../hypervisor
C_SRCS = boot.c pe.c malloc.c
ACRN_OBJS := $(patsubst %.c,$(EFI_OBJDIR)/%.o,$(C_SRCS))
INCLUDE_PATH += $(HV_OBJDIR)/include
INCLUDE_PATH += $(HV_SRC)/include/arch/x86
INCLUDE_PATH += $(HV_SRC)/include/arch/x86/guest
INCLUDE_PATH += $(HV_SRC)/include/public
INCLUDE_PATH += $(HV_SRC)/include/lib
INCLUDE_PATH += $(HV_SRC)/boot/include/guest
SCENARIO ?= sdc
@ -61,10 +67,9 @@ LDSCRIPT := $(GNUEFI_DIR)/elf_$(ARCH)_efi.lds
INCDIR := $(SYSROOT)/usr/include
CFLAGS=-I. -I.. -I../../hypervisor/include/arch/x86/guest -I$(INCDIR)/efi -I$(INCDIR)/efi/$(ARCH) \
-I../../hypervisor/include/public -I../../hypervisor/include/lib -I../../hypervisor/boot/include/guest \
CFLAGS=-I. -I.. -I$(INCDIR)/efi -I$(INCDIR)/efi/$(ARCH) \
-DEFI_FUNCTION_WRAPPER -fPIC -fshort-wchar -ffreestanding \
-Wall -I../fs/ -D$(ARCH) -O2 -I../../hypervisor/include/arch/x86 \
-Wall -I../fs/ -D$(ARCH) -O2 \
-include config.h
CFLAGS += -mno-mmx -mno-sse -mno-sse2 -mno-80387 -mno-fp-ret-in-387