提交 01494d41 编写于 作者: C Caoruihong

chore: use LINUXHDRDIR instead of PREBUILTLINUXHDRDIR as inner variable

use LINUXHDRDIR instead of PREBUILTLINUXHDRDIR as inner variable for
supporting linux uapi header path passing by command line.
Signed-off-by: NCaoruihong <crh.cao@huawei.com>
Change-Id: I73a3f05462856168189641f1d1b3b0dabb28a3dd
上级 f69aaf20
...@@ -46,6 +46,7 @@ NUTTXDIR = $(TOPDIR)/third_party/NuttX ...@@ -46,6 +46,7 @@ NUTTXDIR = $(TOPDIR)/third_party/NuttX
SYSROOTDIR = $(TOPDIR)/prebuilts/lite/sysroot SYSROOTDIR = $(TOPDIR)/prebuilts/lite/sysroot
LITEOSADIR = $(TOPDIR)/kernel/liteos_a LITEOSADIR = $(TOPDIR)/kernel/liteos_a
LINUXDIR = $(TOPDIR)/kernel/linux-4.19 LINUXDIR = $(TOPDIR)/kernel/linux-4.19
LINUXHDRDIR = $(PREBUILTLINUXHDRDIR)
TARGETS = $(if $(wildcard $(LITEOSADIR)),liteos_a_user,) TARGETS = $(if $(wildcard $(LITEOSADIR)),liteos_a_user,)
TARGETS += $(if $(wildcard $(LINUXDIR)),linux_user,) TARGETS += $(if $(wildcard $(LINUXDIR)),linux_user,)
...@@ -126,8 +127,8 @@ musl_install_for_liteos_a_user: musl_patch_for_liteos_a_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 && \ CC="$(CC)" CROSS_COMPILE="$(CROSS_COMPILE)" CFLAGS="$(CFLAGS)" >/dev/null && \
make -sj install-headers install-libs DESTDIR=$(SYSROOTDIR) make -sj install-headers install-libs DESTDIR=$(SYSROOTDIR)
ifeq ($(wildcard $(PREBUILTLINUXHDRDIR)),) ifeq ($(wildcard $(LINUXHDRDIR)),)
PREBUILTLINUXHDRDIR = $(shell pwd)/linux_header_install_for_linux_user/include LINUXHDRDIR = $(shell pwd)/linux_header_install_for_linux_user/include
linux_header_install_for_linux_user: linux_header_install_for_linux_user:
$(HIDE) make -sj headers_install ARCH=$(ARCH) INSTALL_HDR_PATH=$(shell pwd)/$@ -C $(LINUXDIR) $(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 musl_patch_for_linux_user: linux_header_install_for_linux_user
...@@ -136,14 +137,14 @@ endif ...@@ -136,14 +137,14 @@ endif
musl_patch_for_linux_user: musl_copy_for_linux_user musl_patch_for_linux_user: musl_copy_for_linux_user
$(HIDE) cp -rfp $(MUSLDIR)/porting/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: TARGET = $(ARCH)-linux-ohosmusl
musl_install_for_linux_user: musl_patch_for_linux_user musl_install_for_linux_user: musl_patch_for_linux_user
$(HIDE) cd musl_copy_for_linux_user && mkdir -p $(MUSLBUILDDIR) && cd $(MUSLBUILDDIR) && \ $(HIDE) cd musl_copy_for_linux_user && mkdir -p $(MUSLBUILDDIR) && cd $(MUSLBUILDDIR) && \
../configure --prefix=/usr --target=$(TARGET) --includedir=/usr/include/$(TARGET) --libdir=/usr/$(MULTILIB) \ ../configure --prefix=/usr --target=$(TARGET) --includedir=/usr/include/$(TARGET) --libdir=/usr/$(MULTILIB) \
CC="$(CC)" CROSS_COMPILE="$(CROSS_COMPILE)" CFLAGS="$(CFLAGS)" >/dev/null && \ CC="$(CC)" CROSS_COMPILE="$(CROSS_COMPILE)" CFLAGS="$(CFLAGS)" >/dev/null && \
make -sj install-headers install-libs DESTDIR=$(SYSROOTDIR) 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 ($(ARCH),arm)
ifeq ($(BUILD_ALL_MULTILIB),true) ifeq ($(BUILD_ALL_MULTILIB),true)
...@@ -160,7 +161,7 @@ ifneq ($$(ARCH_CFLAGS),$$($(2))) ...@@ -160,7 +161,7 @@ ifneq ($$(ARCH_CFLAGS),$$($(2)))
all: $$(if $$(filter linux_user,$$(TARGETS)),musl_install_for_linux_user$(1),) 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),) 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): TARGET = $$(ARCH)-linux-ohosmusl
musl_install_for_linux_user$(1): override ARCH_CFLAGS = $$($(2)) musl_install_for_linux_user$(1): override ARCH_CFLAGS = $$($(2))
musl_install_for_linux_user$(1): musl_install_for_linux_user musl_install_for_linux_user$(1): musl_install_for_linux_user
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册