From 225bd1338137942abbd4d9feda56f341c8d1c6ff Mon Sep 17 00:00:00 2001 From: xuxin19 Date: Tue, 12 Sep 2023 15:06:23 +0800 Subject: [PATCH] change Mac sim archive operate from replace to quick insertion 'rcS' will case files that has duplicate name been replaced. so on the Mac platform we use 'q' instead of 'r' to achieve an effect similar to '-P' Signed-off-by: xuxin19 --- boards/sim/sim/sim/scripts/Make.defs | 2 +- tools/{macar-rcs.sh => macar-qcs.sh} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename tools/{macar-rcs.sh => macar-qcs.sh} (99%) diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs index 1ce4572cb03..f5a8f739912 100644 --- a/boards/sim/sim/sim/scripts/Make.defs +++ b/boards/sim/sim/sim/scripts/Make.defs @@ -163,7 +163,7 @@ CPP = $(CROSSDEV)cc -E -P -x c LD = $(CROSSDEV)ld ifeq ($(CONFIG_HOST_MACOS),y) STRIP = $(CROSSDEV)strip -AR = $(TOPDIR)/tools/macar-rcs.sh +AR = $(TOPDIR)/tools/macar-qcs.sh else STRIP = $(CROSSDEV)strip --strip-unneeded AR = $(CROSSDEV)ar rcsP diff --git a/tools/macar-rcs.sh b/tools/macar-qcs.sh similarity index 99% rename from tools/macar-rcs.sh rename to tools/macar-qcs.sh index 1efff39893b..b1b73757658 100755 --- a/tools/macar-rcs.sh +++ b/tools/macar-qcs.sh @@ -39,6 +39,6 @@ # https://opensource.apple.com/source/cctools/cctools-949.0.1/misc/ set -e -ar rcS "$@" +ar qcS "$@" # Note: the following line is using bash process substitution ranlib -no_warning_for_no_symbols "$1" 2> >(grep -F -v "the table of contents is empty")