diff --git a/libs/libc/zoneinfo/Makefile b/libs/libc/zoneinfo/Makefile index 1abbb7f1dd1..aca707f9ef7 100644 --- a/libs/libc/zoneinfo/Makefile +++ b/libs/libc/zoneinfo/Makefile @@ -61,7 +61,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: .tzbuilt romfs $(OBJS) - $(call ARCHIVE_ADD, ..$(DELIM)$(BIN), $(filter-out .tzbuilt romfs, $^)) + $(call ARCHIVE, ..$(DELIM)$(BIN), $(filter-out .tzbuilt romfs, $^)) $(Q) touch .built # ROMFS file system containing the TZ database diff --git a/tools/Config.mk b/tools/Config.mk index 50761cacd4a..4f41c5e8356 100644 --- a/tools/Config.mk +++ b/tools/Config.mk @@ -335,34 +335,11 @@ define INSTALL_LIB $(Q) install -m 0644 $1 $2 endef -# ARCHIVE_ADD - Add a list of files to an archive -# Example: $(call ARCHIVE_ADD, archive-file, "file1 file2 file3 ...") -# -# Note: The fileN strings may not contain spaces or characters that may be -# interpreted strangely by the shell -# -# Depends on these settings defined in board-specific Make.defs file -# installed at $(TOPDIR)/Make.defs: -# -# AR - The command to invoke the archiver (includes any options) -# -# Depends on this settings defined in board-specific defconfig file installed -# at $(TOPDIR)/.config: -# -# CONFIG_WINDOWS_NATIVE - Defined for a Windows native build - -define ARCHIVE_ADD - @echo "AR (add): ${shell basename $(1)} $(2)" - $(Q) $(AR) $1 $(2) -endef - # ARCHIVE - Same as above, but ensure the archive is # created from scratch define ARCHIVE - @echo "AR (create): ${shell basename $(1)} $(2)" - $(Q) $(RM) $1 - $(Q) $(AR) $1 $(2) + $(AR) $1 $(2) endef # PRELINK - Prelink a list of files