commit ddca3dec36a0bbb996ef702b7d94cc8fb3b35827
author Johann Koenig <johannkoenig@google.com> Thu Oct 27 08:38:48 2022
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 27 08:38:48 2022
tree e627b67a962b04f9ecce91e3dcbfb23277b6ef5e
parent 17fbc6cfa1e39d4502574db5dc4212d49fa91d7b
parent ebf22e2e8db9e863a2cbc24081381e24fe306882

Merge "MacOS 13 is darwin22" into main

.mailmap

diff --git a/.mailmap b/.mailmap
index 376ca83..3593de4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,8 +21,8 @@
 Jim Bankoski <jimbankoski@google.com>
 Johann Koenig <johannkoenig@google.com>
 Johann Koenig <johannkoenig@google.com> <johann.koenig@duck.com>
-Johann Koenig <johannkoenig@google.com> <johann.koenig@gmail.com>
 Johann Koenig <johannkoenig@google.com> <johannkoenig@chromium.org>
+Johann <johann@duck.com> <johann.koenig@gmail.com>
 John Koleszar <jkoleszar@google.com>
 Joshua Litt <joshualitt@google.com> <joshualitt@chromium.org>
 Marco Paniconi <marpan@google.com>

build/make/rtcd.pl

diff --git a/build/make/rtcd.pl b/build/make/rtcd.pl
index 9c97268..f4edeaa 100755
--- a/build/make/rtcd.pl
+++ b/build/make/rtcd.pl
@@ -488,7 +488,8 @@
   arm;
 } elsif ($opts{arch} eq 'armv8' || $opts{arch} eq 'arm64' ) {
   @ALL_ARCHS = filter(qw/neon/);
-  &require("neon");
+  @REQUIRES = filter(qw/neon/);
+  &require(@REQUIRES);
   arm;
 } elsif ($opts{arch} =~ /^ppc/ ) {
   @ALL_ARCHS = filter(qw/vsx/);