diff --git a/Documentation/quickstart/install.rst b/Documentation/quickstart/install.rst
index 2d85d7efd1..043bd456df 100644
--- a/Documentation/quickstart/install.rst
+++ b/Documentation/quickstart/install.rst
@@ -45,6 +45,8 @@ First, install the following set of system dependencies according to your Operat
 
     .. code-block:: console
 
+      $ brew tap discoteq/discoteq
+      $ brew install flock
       $ brew install x86_64-elf-gcc  # Used by simulator
       $ brew install u-boot-tools  # Some platform integrate with u-boot
 
diff --git a/README.md b/README.md
index 616d039c0d..a31e558009 100644
--- a/README.md
+++ b/README.md
@@ -522,8 +522,16 @@ framework like GTK or Qt.  So this might be a trip down the rabbit hole.
 
 ### Using macOS
 
-You need to install at least the following tools specific to macOS
-if you want to build the sim:
+You need to install at least the following tools specific to macOS.
+
+  * flock (used by APPDIR build logic)
+
+A macOS port is available at: <https://github.com/discoteq/flock>
+
+    brew tap discoteq/discoteq
+    brew install flock
+
+  If you want to build the sim:
 
   * Xcode (the native compiler and the rest of the toolchain)
 
diff --git a/libs/libc/zoneinfo/Makefile b/libs/libc/zoneinfo/Makefile
index c3c46d93ab..0fd1c68eef 100644
--- a/libs/libc/zoneinfo/Makefile
+++ b/libs/libc/zoneinfo/Makefile
@@ -46,7 +46,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)
 
 .built: .tzbuilt romfs $(OBJS)
-	$(call ARCHIVE_ADD, ..$(DELIM)$(BIN), $(OBJS))
+	$(call ARCHIVE, ..$(DELIM)$(BIN), $(OBJS))
 	$(Q) touch .built
 
 # ROMFS file system containing the TZ database
diff --git a/tools/Config.mk b/tools/Config.mk
index 464d23b298..b4f6101abf 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -395,8 +395,8 @@ define INSTALL_LIB
 	$(ECHO_END)
 endef
 
-# ARCHIVE_ADD - Add a list of files to an archive
-# Example: $(call ARCHIVE_ADD, archive-file, "file1 file2 file3 ...")
+# ARCHIVE - Add a list of files to an archive
+# Example: $(call ARCHIVE, archive-file, "file1 file2 file3 ...")
 #
 # Note: The fileN strings may not contain spaces or  characters that may be
 # interpreted strangely by the shell
@@ -411,18 +411,8 @@ endef
 #
 #   CONFIG_WINDOWS_NATIVE - Defined for a Windows native build
 
-define ARCHIVE_ADD
-	$(ECHO_BEGIN)"AR (add): ${shell basename $(1)} "
-	$(Q) $(AR) $1 $2
-	$(ECHO_END)
-endef
-
-# ARCHIVE - Same as above, but ensure the archive is
-# created from scratch
-
 define ARCHIVE
-	$(Q) $(RM) $1
-	$(Q) $(AR) $1  $2
+	$(AR) $1  $2
 endef
 
 # PRELINK - Prelink a list of files