提交 38ebcbf9 编写于 作者: C Caoruihong

chore: no need build all multilibs now

we should only build the desired multilib as one product
usually needs only one multilib, this can save us some build time.
Signed-off-by: NCaoruihong <crh.cao@huawei.com>
Change-Id: Ib5ce66c6c5e1dd3d7287b46e04d7ceea7b93ef25
上级 d1ec389f
...@@ -50,6 +50,7 @@ if (!defined(board_configed_sysroot) || board_configed_sysroot == "") { ...@@ -50,6 +50,7 @@ if (!defined(board_configed_sysroot) || board_configed_sysroot == "") {
arch_cflags = string_join(" ", target_arch_cflags) arch_cflags = string_join(" ", target_arch_cflags)
command = "make TOPDIR=$ohos_root_path SYSROOTDIR=$sysroot_path TARGETS=$targets -f $makefile" command = "make TOPDIR=$ohos_root_path SYSROOTDIR=$sysroot_path TARGETS=$targets -f $makefile"
command += " ARCH=$arch TARGET=$target_triple ARCH_CFLAGS=\"$arch_cflags\"" command += " ARCH=$arch TARGET=$target_triple ARCH_CFLAGS=\"$arch_cflags\""
command += " BUILD_DEBUG=false BUILD_ALL_MULTILIB=false"
# copy standard libraries libc.so and libc++.so to lib out dir # copy standard libraries libc.so and libc++.so to lib out dir
libcpp = "\$($ohos_current_cxx_command --target=$target_triple --sysroot=$sysroot_path $arch_cflags -print-file-name=libc++.so)" libcpp = "\$($ohos_current_cxx_command --target=$target_triple --sysroot=$sysroot_path $arch_cflags -print-file-name=libc++.so)"
......
...@@ -98,15 +98,15 @@ nuttx_header_install_for_liteos_a_user: musl_copy_for_liteos_a_user ...@@ -98,15 +98,15 @@ nuttx_header_install_for_liteos_a_user: musl_copy_for_liteos_a_user
$(HIDE) sed '/^#include/d' $(NUTTXDIR)/include/nuttx/video/fb.h | sed 's,FAR ,,g' | sed 's,LosVmMapRegion,void,g' > $</include/fb.h $(HIDE) sed '/^#include/d' $(NUTTXDIR)/include/nuttx/video/fb.h | sed 's,FAR ,,g' | sed 's,LosVmMapRegion,void,g' > $</include/fb.h
linux_header_install_for_liteos_a_user: musl_copy_for_liteos_a_user linux_header_install_for_liteos_a_user: musl_copy_for_liteos_a_user
$(HIDE) mkdir -p $@
$(HIDE) make -sj headers_install ARCH=$(ARCH) INSTALL_HDR_PATH=$(shell pwd)/$@ -C $(LINUXKERNELDIR) $(HIDE) make -sj headers_install ARCH=$(ARCH) INSTALL_HDR_PATH=$(shell pwd)/$@ -C $(LINUXKERNELDIR)
$(HIDE) install -p -m 644 -D $@/include/linux/capability.h $</include/linux/capability.h $(HIDE) install -p -m 644 -D $@/include/linux/capability.h $</include/linux/capability.h
$(HIDE) echo "$$LINUX_TYPES_H" > $</include/linux/types.h $(HIDE) echo "$$LINUX_TYPES_H" > $</include/linux/types.h
linux_header_install_for_linux_user: musl_copy_for_linux_user linux_header_install_for_linux_user: musl_copy_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)
$(HIDE) find $< \( -name .install -o -name ..install.cmd \) -delete $(HIDE) find $@ \( -name .install -o -name ..install.cmd \) -delete
$(HIDE) find $< -type d -empty -delete $(HIDE) find $@ -type d -empty -delete
$(HIDE) cp -rfp $@/* $</
musl_patch_for_liteos_a_user: nuttx_header_install_for_liteos_a_user musl_patch_for_liteos_a_user: nuttx_header_install_for_liteos_a_user
musl_patch_for_liteos_a_user: linux_header_install_for_liteos_a_user musl_patch_for_liteos_a_user: linux_header_install_for_liteos_a_user
...@@ -128,6 +128,7 @@ musl_install_for_linux_user: musl_patch_for_linux_user ...@@ -128,6 +128,7 @@ musl_install_for_linux_user: musl_patch_for_linux_user
../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 && \
sed 's, -m 644 , -m 444 ,g' Makefile | make -f- -sj install-headers install-libs DESTDIR=$(SYSROOTDIR) sed 's, -m 644 , -m 444 ,g' Makefile | make -f- -sj install-headers install-libs DESTDIR=$(SYSROOTDIR)
$(HIDE) cp -rfp linux_header_install_for_linux_user/include/* $(SYSROOTDIR)/usr/include/$(TARGET)
ifeq ($(BUILD_DEBUG),true) ifeq ($(BUILD_DEBUG),true)
musl_install_for_liteos_a_user: CFLAGS += -funwind-tables -fasynchronous-unwind-tables -rdynamic -I $(shell $(CC) -print-file-name=)include musl_install_for_liteos_a_user: CFLAGS += -funwind-tables -fasynchronous-unwind-tables -rdynamic -I $(shell $(CC) -print-file-name=)include
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册