Bug 40439: Create universal x86_64/arm64 mac builds

Closes #40439 (closed) #40067 (closed)

doc/HACKING.txt

@@ -44,13 +44,13 @@ In each of those places, an option can be defined:
 The targets are usually used to select:
 
 - the platform: torbrowser-linux-x86_64, torbrowser-linux-i686,
-  torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64,
+  torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-macos,
   torbrowser-android-armv7, torbrowser-android-aarch64, torbrowser-android-x86,
   torbrowser-android-x86_64
 - the channel: release, nightly, alpha
 
 The targets torbrowser-linux-x86_64, torbrowser-linux-i686,
-torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64,
+torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-macos,
 torbrowser-android-armv7, torbrowser-android-x86, torbrowser-android-aarch64,
 torbrowser-android-x86_64 are special cases. They do not contain options
 directly, instead they contain a list of other targets. For instance, the
@@ -99,8 +99,8 @@ You can use the following template syntax in the build scripts:
     # do something for linux
   [% ELSIF c("var/windows") -%]
     # do something for windows
-  [% ELSIF c("var/osx") -%]
-    # do something for osx
+  [% ELSIF c("var/macos") -%]
+    # do something for macOS
   [% END -%]
 
 You can also use var/linux-x86_64 and var/linux-i686 for things that
@@ -117,9 +117,9 @@ depending on the target:
     windows-i686:
       var:
         do_something: 'do something for windows'
-    osx-x86_64:
+    macos-x86_64:
       var:
-        do_something: 'do something for osx'
+        do_something: 'do something for macos'
 
 And in the build script, use:
 
@@ -154,7 +154,7 @@ $platform should be one of the following:
 
  - torbrowser-windows-x86_64
 
- - torbrowser-osx-x86_64
+ - torbrowser-macos
 
  - torbrowser-android-armv7