From 6f6dc4f24c8ab05a6d42da46a9fa41d74a477bd7 Mon Sep 17 00:00:00 2001 From: arvinzzz Date: Mon, 28 Jun 2021 16:52:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=86=85=E6=A0=B8c?= =?UTF-8?q?=E5=BA=93=E7=9A=84makefile=E4=B8=AD=E8=A2=AB=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E6=9B=BF=E6=8D=A2=E7=9A=84=E9=AB=98=E9=A2=91?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=BE=9D=E7=84=B6=E5=8F=82=E4=B8=8E=E4=BA=86?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 更正makefile过滤时被替换函数的不正确路径 2. 防止LOCAL_SRCS再直接+= /*/*.c添加回来 close: #I3XGM8 Signed-off-by: arvinzzz Change-Id: I3aff2a60c5a48f2d6c174afa04d30fa6f5514d7e --- lib/libc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 19416225..d569a6c8 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -18,7 +18,7 @@ LOCAL_SRCS = $(wildcard $(addprefix $(MUSLPORTINGDIR)/,$(MUSLPORTING_SRCS))) LOCAL_SRCS := $(filter-out $(subst $(MUSLPORTINGDIR),$(MUSLDIR),$(LOCAL_SRCS)),$(addprefix $(MUSLDIR)/,$(MUSL_SRCS)) $(LOCAL_SRCS)) ifeq ($(LOSCFG_ARCH_ARM_VER), "armv7-a") -LOCAL_SRCS := $(filter-out $(addprefix $(MUSLDIR)/src/string/,memchr.c memcpy.c strcmp.c strcpy.c strlen.c), $(LOCAL_SRCS)) +LOCAL_SRCS := $(filter-out $(addprefix $(MUSLPORTINGDIR)/src/string/,memchr.c memcpy.c strcmp.c strcpy.c strlen.c), $(LOCAL_SRCS)) LOCAL_SRCS += \ $(OPTRTDIR)/string/arm/memchr.S \ $(OPTRTDIR)/string/arm/memcpy.S \