!49 内部使用LINUXHDRDIR变量代替PREBUILTLINUXHDRDIR以正确实现通过命令行参数指定LINUX UAPI头文件路径

Merge pull request !49 from Caoruihong/PREBUILTLINUXHDRDIR

build/Makefile

@@ -46,6 +46,7 @@ NUTTXDIR = $(TOPDIR)/third_party/NuttX
 SYSROOTDIR = $(TOPDIR)/prebuilts/lite/sysroot
 LITEOSADIR = $(TOPDIR)/kernel/liteos_a
 LINUXDIR = $(TOPDIR)/kernel/linux-4.19
+LINUXHDRDIR = $(PREBUILTLINUXHDRDIR)
 
 TARGETS = $(if $(wildcard $(LITEOSADIR)),liteos_a_user,)
 TARGETS += $(if $(wildcard $(LINUXDIR)),linux_user,)
@@ -126,8 +127,8 @@ musl_install_for_liteos_a_user: musl_patch_for_liteos_a_user
 		CC="$(CC)" CROSS_COMPILE="$(CROSS_COMPILE)" CFLAGS="$(CFLAGS)" >/dev/null && \
 	make -sj install-headers install-libs DESTDIR=$(SYSROOTDIR)
 
-ifeq ($(wildcard $(PREBUILTLINUXHDRDIR)),)
-PREBUILTLINUXHDRDIR = $(shell pwd)/linux_header_install_for_linux_user/include
+ifeq ($(wildcard $(LINUXHDRDIR)),)
+LINUXHDRDIR = $(shell pwd)/linux_header_install_for_linux_user/include
 linux_header_install_for_linux_user:
 	$(HIDE) make -sj headers_install ARCH=$(ARCH) INSTALL_HDR_PATH=$(shell pwd)/$@ -C $(LINUXDIR)
 musl_patch_for_linux_user: linux_header_install_for_linux_user
@@ -136,14 +137,14 @@ endif
 musl_patch_for_linux_user: musl_copy_for_linux_user
 	$(HIDE) cp -rfp $(MUSLDIR)/porting/linux/user/* $</
 
-musl_install_for_linux_user: CFLAGS += -I $(PREBUILTLINUXHDRDIR)
+musl_install_for_linux_user: CFLAGS += -I $(LINUXHDRDIR)
 musl_install_for_linux_user: TARGET = $(ARCH)-linux-ohosmusl
 musl_install_for_linux_user: musl_patch_for_linux_user
 	$(HIDE) cd musl_copy_for_linux_user && mkdir -p $(MUSLBUILDDIR) && cd $(MUSLBUILDDIR) && \
 	../configure --prefix=/usr --target=$(TARGET) --includedir=/usr/include/$(TARGET) --libdir=/usr/$(MULTILIB) \
 		CC="$(CC)" CROSS_COMPILE="$(CROSS_COMPILE)" CFLAGS="$(CFLAGS)" >/dev/null && \
 	make -sj install-headers install-libs DESTDIR=$(SYSROOTDIR)
-	$(HIDE) cp -rfp $(PREBUILTLINUXHDRDIR)/* $(SYSROOTDIR)/usr/include/$(TARGET)
+	$(HIDE) cp -rfp $(LINUXHDRDIR)/* $(SYSROOTDIR)/usr/include/$(TARGET)
 
 ifeq ($(ARCH),arm)
 ifeq ($(BUILD_ALL_MULTILIB),true)
@@ -160,7 +161,7 @@ ifneq ($$(ARCH_CFLAGS),$$($(2)))
 all: $$(if $$(filter linux_user,$$(TARGETS)),musl_install_for_linux_user$(1),)
 all: $$(if $$(filter liteos_a_user,$$(TARGETS)),musl_install_for_liteos_a_user$(1),)
 
-musl_install_for_linux_user$(1): CFLAGS += -I $$(PREBUILTLINUXHDRDIR)
+musl_install_for_linux_user$(1): CFLAGS += -I $$(LINUXHDRDIR)
 musl_install_for_linux_user$(1): TARGET = $$(ARCH)-linux-ohosmusl
 musl_install_for_linux_user$(1): override ARCH_CFLAGS = $$($(2))
 musl_install_for_linux_user$(1): musl_install_for_linux_user