Bug 40067: Rename osx targets and configs to macos

doc/HACKING.txt

@@ -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:
 

projects/browser/build

@@ -19,7 +19,7 @@ GENERATEDPREFSPATH=$rootdir/Bundle-Data/PTConfigs/generated-prefs.js
 # Create initially empty prefs file where we can dump our conditionally included/genetered prefs
 touch "$GENERATEDPREFSPATH"
 
-[% IF c("var/osx") %]
+[% IF c("var/macos") %]
   TBDIR="$TB_STAGE_DIR/[% c("var/Project_Name") %].app"
   TBDIR_AARCH64="$TB_STAGE_DIR/[% c("var/Project_Name") %]-aarch64.app"
   TBDIRS=("$TBDIR" "$TBDIR_AARCH64")
@@ -60,7 +60,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b
     local dest="${args[-1]}"
     unset args[-1]
     mv ${args[@]} "$TBDIR/$dest"
-    [% IF c("var/osx") -%]
+    [% IF c("var/macos") -%]
       for src in ${args[@]}
       do
         mv "aarch64/$src" "$TBDIR_AARCH64/$dest"
@@ -69,27 +69,27 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b
   }
 
   tar -xvf [% c('input_files_by_name/tor-expert-bundle') %]
-  [% IF c("var/osx") -%]
+  [% IF c("var/macos") -%]
     mkdir aarch64
     tar -C aarch64 -xf [% c('input_files_by_name/tor-expert-bundle-aarch64') %]
   [% END -%]
 
   # geoip(6) and anything else that belongs in the data dir from the expert bundle
-  mkdir -p "$TBDIR/$TORCONFIGPATH" [% IF c("var/osx") %]"$TBDIR_AARCH64/$TORCONFIGPATH"[% END %]
+  mkdir -p "$TBDIR/$TORCONFIGPATH" [% IF c("var/macos") %]"$TBDIR_AARCH64/$TORCONFIGPATH"[% END %]
   mv_tbdir data/{geoip,geoip6} "$TORCONFIGPATH"
 
   # Bridge lists will be consumed later in `bridges_conf`
   mv tor/pluggable_transports/bridges_list.*.txt $rootdir
-  [% IF c("var/osx") %]
+  [% IF c("var/macos") %]
     rm -f aarch64/tor/pluggable_transports/bridges_list.*.txt
   [% END -%]
 
   # Snowflake's README is the only documentation shipped in tor-expert-bundle
-  mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/osx") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %]
+  mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %]
   mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md"
 
   # Move the PTs to where TB expects them
-  mkdir -p "$TBDIR/$TORBINPATH" [% IF c("var/osx") %]"$TBDIR_AARCH64/$TORBINPATH"[% END %]
+  mkdir -p "$TBDIR/$TORBINPATH" [% IF c("var/macos") %]"$TBDIR_AARCH64/$TORBINPATH"[% END %]
   mv_tbdir tor/pluggable_transports "$TORBINPATH/PluggableTransports"
 
   # Move tor and dependencies to where TB expects them
@@ -111,7 +111,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b
 
 for tbdir in "${TBDIRS[@]}"
 do
-  [% IF c("var/osx") -%]
+  [% IF c("var/macos") -%]
     tbdir="$tbdir/Contents/Resources"
   [% END -%]
   tar -C "$tbdir" -xf [% c('input_files_by_name/fonts') %]
@@ -145,7 +145,7 @@ RBM_TB_EOF
 
 tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz
 
-[% IF c("var/osx") -%]
+[% IF c("var/macos") -%]
   # Use symlink in tmp dir to extract "Tor Browser.app" to "Tor Browser-aarch64.app"
   ff_aarch64=$(mktemp -d)
   ln -s "$TBDIR_AARCH64" "$ff_aarch64/[% c("var/Project_Name") %].app"
@@ -161,13 +161,12 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz
   find . -exec [% c("touch") %] {} \;
   for tbdir in "${TBDIRS[@]}"
   do
-    find chrome/ | sort | zip -X -@ "$tbdir[% IF c('var/osx') %]/Contents/Resources[% END %]/browser/omni.ja"
+    find chrome/ | sort | zip -X -@ "$tbdir[% IF c('var/macos') %]/Contents/Resources[% END %]/browser/omni.ja"
   done
   popd
   rm -rf $TMP_MANUAL_PATH
 [% END -%]
 
-
 [% IF c("var/namecoin") %]
   # Extract Electrum-NMC
   tar -C "$TBDIR/TorBrowser" -xf [% c('input_files_by_name/electrum-nmc') %]
@@ -182,13 +181,13 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz
 
 [% IF c("var/linux");
      SET bundledata_osname = 'linux';
-   ELSIF c("var/osx");
+   ELSIF c("var/macos");
      SET bundledata_osname = 'mac';
    ELSIF c("var/windows");
      SET bundledata_osname = 'windows';
    END; %]
 
-[% IF c("var/osx") %]
+[% IF c("var/macos") %]
   # The Bundle-Data is designed for embedded data, so we need to modify
   # the structure when we want the data to be outside the app directory.
   # We also create an override.ini file to disable the profile migrator.
@@ -222,7 +221,7 @@ do
   cp -a Bundle-Data/Docs/* "$tbdir/$DOCSPATH"
   tar -C Bundle-Data/[% bundledata_osname %] \
     [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] \
-    -c . | tar -C "$tbdir[% IF ! c("var/osx") %]/[% c('var/ProjectName') %][% END %]" -x
+    -c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') %][% END %]" -x
 done
 
 [% IF c("var/tor-browser") -%]
@@ -262,7 +261,7 @@ PKG_DIR='[% c("var/project-name") %]'
 
 for tbdir in "${TBDIRS[@]}"
 do
-  tbdir="$tbdir[% IF c('var/osx') %]/Contents/Resources[% END %]/browser/"
+  tbdir="$tbdir[% IF c('var/macos') %]/Contents/Resources[% END %]/browser/"
   pushd "$tbdir"
   unzip omni.ja defaults/preferences/[% c("var/prefs_file") %] || [ $? -lt 3 ]
   # Append our built extension-overrides.js to the preferences file
@@ -285,7 +284,7 @@ done
   mv $distdir/windows-installer ${TB_STAGE_DIR}
 [% END %]
 
-[% IF c("var/osx") -%]
+[% IF c("var/macos") -%]
   # unify.py requires lipo, so we need to add cctools in the PATH
   tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/macosx-toolchain') %]
   export PATH="/var/tmp/dist/macosx-toolchain/cctools/bin:$PATH"
@@ -308,7 +307,7 @@ done
 
 [% IF c("var/windows") %]
   TBDIR="$distdir/$PKG_DIR/[% c("var/Project_Name") %]/Browser"
-[% ELSIF c("var/osx") %]
+[% ELSIF c("var/macos") %]
   TBDIR="$distdir/$PKG_DIR/[% c("var/Project_Name") %].app"
 [% ELSE %]
   TBDIR="$distdir/$PKG_DIR/Browser"
@@ -319,7 +318,7 @@ cat > "$scripts_dir/create-$PKG_DIR" << SCRIPT_EOF
 set -e
 cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR
 
-pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]"
+pushd "$TBDIR[% IF c("var/macos") %]/Contents/Resources/[% END %]"
 rm -f precomplete
 python $MARTOOLS/createprecomplete.py
 popd
@@ -340,7 +339,7 @@ cd $distdir
         tar_src => [ '$PKG_DIR' ],
         tar_args => '-cJf $OUTDIR/' _ c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.tar.xz',
     }) %]
-[% ELSIF c("var/osx") %]
+[% ELSIF c("var/macos") %]
   [% c('var/ddmg', {
         dmg_src => '"$PKG_DIR"',
         dmg_out => '$OUTDIR/' _ c('var/ProjectName') _ '-' _ c("var/torbrowser_version") _ '-' _ c("var/mar_osname") _ '_${PKG_LOCALE}.dmg',

projects/browser/config

@@ -26,7 +26,7 @@ targets:
   linux-x86_64:
     var:
       mar_osname: linux64
-  osx:
+  macos:
     var:
       mar_osname: macos
       arch_deps:
@@ -66,13 +66,13 @@ input_files:
     enable: '[% ! c("var/android") %]'
   - project: firefox
     name: firefox-aarch64
-    enable: '[% c("var/osx") %]'
+    enable: '[% c("var/macos") %]'
     target_prepend:
-      - osx-aarch64
+      - macos-aarch64
   - project: firefox
     name: src-firefox
     pkg_type: src-tarballs
-    enable: '[% c("var/osx") %]'
+    enable: '[% c("var/macos") %]'
   - project: fenix
     name: fenix
     enable: '[% c("var/android") %]'
@@ -81,9 +81,9 @@ input_files:
     enable: '[% c("var/tor-browser") %]'
   - project: tor-expert-bundle
     name: tor-expert-bundle-aarch64
-    enable: '[% c("var/osx") && c("var/tor-browser") %]'
+    enable: '[% c("var/macos") && c("var/tor-browser") %]'
     target_prepend:
-      - osx-aarch64
+      - macos-aarch64
   - project: fonts
     name: fonts
     enable: '[% ! c("var/android") %]'
@@ -96,7 +96,7 @@ input_files:
     enable: '[% c("var/linux") %]'
   - project: libdmg-hfsplus
     name: libdmg
-    enable: '[% c("var/osx") %]'
+    enable: '[% c("var/macos") %]'
   - project: nsis
     name: nsis
     enable: '[% c("var/windows") %]'
@@ -109,7 +109,7 @@ input_files:
     enable: '[% c("var/android") %]'
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
-    enable: '[% c("var/android") || c("var/osx") %]'
+    enable: '[% c("var/android") || c("var/macos") %]'
   - name: electrum-nmc
     project: electrum-nmc
     enable: '[% c("var/namecoin") %]'

projects/clang/build

@@ -28,7 +28,7 @@ cd build
 cmake ../llvm -G "Unix Makefiles" \
               -DCMAKE_INSTALL_PREFIX=$distdir \
               -DCMAKE_BUILD_TYPE=Release \
-            [% IF c("var/android") || c("var/osx") -%]
+            [% IF c("var/android") || c("var/macos") -%]
               -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \
             [% END -%]
             [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly[% END %] \

projects/firefox/build

@@ -41,7 +41,7 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bi
   # Copy it over.
   # https://searchfox.org/mozilla-central/source/build/build-clang/build-clang.py#890,
   # include it directly in our clang
-  [% IF c("var/osx") -%]
+  [% IF c("var/macos") -%]
     rtdir=/var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi
   [% ELSIF c("var/windows") -%]
     rtdir=/var/tmp/dist/mingw-w64-clang/lib/clang/[% pc("clang", "version") %]/lib/wasi
@@ -58,7 +58,7 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bi
 
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 
-mkdir -p $distdir/[% IF ! c("var/osx") %]Browser[% END %]
+mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %]
 
 tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %]
 transl_base_browser=$rootdir/translation-base-browser
@@ -117,7 +117,7 @@ add_translation () {
 
 [% FOREACH lang = c('var/locales') %]
   lang='[% tmpl(lang) %]'
-  [% IF c("var/osx") -%]
+  [% IF c("var/macos") -%]
   if [ "$lang" == "ja-JP-mac" ]; then
     lang="ja"
   fi
@@ -164,7 +164,7 @@ export LANG=C.UTF-8
   ./mach build stage-package
 [% END %]
 
-[% IF c("var/osx") %]
+[% IF c("var/macos") %]
   cp -a obj-*/dist/firefox/* $distdir
   [% IF c("var/base-browser") -%]
     mv "$distdir/Firefox.app" "$distdir/[% c('var/Project_Name') %].app"
@@ -216,7 +216,7 @@ cp -p config/createprecomplete.py $MARTOOLS/
 cp -p tools/update-packaging/*.sh $MARTOOLS/
 cp -p obj-*/dist/host/bin/mar $MARTOOLS/
 cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
-[% IF c("var/linux") || c("var/osx") %]
+[% IF c("var/linux") || c("var/macos") %]
   cp -p obj-*/dist/bin/signmar $MARTOOLS/
   cp -p obj-*/dist/bin/certutil $MARTOOLS/
   cp -p obj-*/dist/bin/modutil $MARTOOLS/
@@ -271,13 +271,13 @@ cd $distdir
 [% IF c("var/windows") || c("var/linux") %]
   [% c("var/rezip", { rezip_file => 'Browser/omni.ja' }) %]
   [% c("var/rezip", { rezip_file => 'Browser/browser/omni.ja' }) %]
-[% ELSIF c("var/osx") %]
+[% ELSIF c("var/macos") %]
   [% c("var/rezip", { rezip_file => '"' _ c("var/Project_Name") _ '.app/Contents/Resources/omni.ja"' }) %]
   [% c("var/rezip", { rezip_file => '"' _ c("var/Project_Name") _ '.app/Contents/Resources/browser/omni.ja"' }) %]
 [% END %]
 
 [%
-IF c("var/osx");
+IF c("var/macos");
   SET browserdir='"' _ c("var/Project_Name") _ '.app/Contents"';
 ELSE;
   SET browserdir='Browser';

projects/firefox/config

@@ -111,9 +111,9 @@ targets:
         # To support Wayland mode
         - libdrm-dev:i386
 
-  osx:
+  macos:
     var:
-      martools_filename: 'mar-tools-mac-[% c("var/osx_arch") %].zip'
+      martools_filename: 'mar-tools-macos-[% c("var/macos_arch") %].zip'
       nightly_updates_osname: macos
       arch_deps:
         - python3
@@ -144,7 +144,7 @@ input_files:
     name: binutils
     enable: '[% c("var/linux") %]'
   - filename: fix-info-plist.py
-    enable: '[% c("var/osx") %]'
+    enable: '[% c("var/macos") %]'
   - filename: nsis-uninstall.patch
     enable: '[% c("var/windows") %]'
   - project: rust

projects/firefox/list_toolchain_updates_checks

@@ -5,7 +5,7 @@
      SET toolchain_alias='linux64-rust';
    ELSIF c("var/windows");
      SET toolchain_alias='mingw32-rust';
-   ELSIF c("var/osx");
+   ELSIF c("var/macos");
      SET toolchain_alias='linux64-rust-macos';
    END; %]
 read -d '' p << 'EOF' || true
@@ -58,7 +58,7 @@ check_update_needed nasm "$needed" "$current"
      SET toolchain_alias='linux64-clang';
    ELSIF c("var/windows");
      SET toolchain_alias='linux64-clang-mingw-x64';
-   ELSIF c("var/osx");
+   ELSIF c("var/macos");
      SET toolchain_alias='macosx64-clang';
    END; %]
 read -d '' p << 'EOF' || true
@@ -142,7 +142,7 @@ current="3.5+" # 3.6.0
 check_update_needed python "$needed" "$current"
 
 
-[% IF c("var/osx") %]
+[% IF c("var/macos") %]
 # macosx-sdk
 read -d '' p << 'EOF' || true
 my $d = YAML::XS::LoadFile('taskcluster/ci/build/macosx.yml');

projects/firefox/mozconfig

-. $topsrcdir/mozconfig-[% IF c("var/osx"); GET 'macos-x86_64'; ELSE; GET c("var/osname"); END; %][% IF c("var/asan") %]-asan[% END %]
+. $topsrcdir/mozconfig-[% IF c("var/macos"); GET 'macos-x86_64'; ELSE; GET c("var/osname"); END; %][% IF c("var/asan") %]-asan[% END %]
 
 [% IF c("var/linux") -%]
   # We want to build with clang now and point to the GCC toolchain until #29041 is
@@ -29,7 +29,7 @@
   BINDGEN_CFLAGS="-I$clang_path/[% c('arch') %]-w64-mingw32/include/c++/v1 -I$clang_path/[% c('arch') %]-w64-mingw32/include"
 [% END -%]
 
-[% IF c("var/osx") -%]
+[% IF c("var/macos") -%]
   TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain
 
   # ld needs libLTO.so from llvm
@@ -56,7 +56,7 @@
   ac_add_options --target=[% c('var/build_target') %]
   export MACOS_SDK_DIR=$CROSS_SYSROOT
   export MACOS_PRIVATE_FRAMEWORKS_DIR=$CROSS_PRIVATE_FRAMEWORKS
-  [% IF c("var/osx-aarch64") -%]
+  [% IF c("var/macos-aarch64") -%]
     # As of Clang 13, the default is -mcpu=apple-m1 when using a aarch64-apple-macos target,
     # but we're using apple64-apple-darwin, which defaults to -mcpu=apple-a7, which disables
     # a bunch of # performance-enabling CPU features.

projects/fonts/build

@@ -14,7 +14,7 @@ mv noto-fonts-* noto-fonts
       GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n";
     END; %]
 [% END %]
-[% IF c("var/osx") %]
+[% IF c("var/macos") %]
   [% FOREACH fontfile = c("var/noto_fonts_mac");
       GET 'cp noto-fonts/' _ fontfile _ ' $distdir/' _ "\n";
     END; %]
@@ -25,7 +25,7 @@ mv noto-fonts-* noto-fonts
     END; %]
 [% END %]
 
-[% IF c("var/linux") || c("var/osx") %]
+[% IF c("var/linux") || c("var/macos") %]
   unzip -o 2.0.0.zip -d STIX
   cp "STIX/stixfonts-2.0.0/archive/STIXv1.1.1/Fonts/STIX-Word/STIXMath-Regular.otf" $distdir/
 [% END %]

projects/fonts/config

@@ -179,4 +179,4 @@ input_files:
     enable: '[% c("var/linux") %]'
   - URL: https://github.com/stipub/stixfonts/archive/2.0.0.zip
     sha256sum: 4327a16797dabebedce28a9075671730e22c7f74831b24b1fb91e27faec5a235
-    enable: '[% c("var/linux") || c("var/osx") %]'
+    enable: '[% c("var/linux") || c("var/macos") %]'

projects/go/build

@@ -40,7 +40,7 @@ export GOROOT="$distdir"
 cd /var/tmp/dist/go/src
 [% IF c("var/linux") -%]
   ./make.bash
-[% ELSIF c("var/osx") -%]
+[% ELSIF c("var/macos") -%]
   unset LDFLAGS
   rm -Rf $clangdir/helpers
   export CC="$clangdir/bin/clang [% c("var/FLAGS") %]"

projects/go/config

@@ -80,13 +80,13 @@ targets:
   windows-x86_64:
     var:
       GOARCH: amd64
-  osx-x86_64:
+  macos-x86_64:
     var:
       GOARCH: amd64
-  osx-aarch64:
+  macos-aarch64:
     var:
       GOARCH: arm64
-  osx:
+  macos:
     var:
       GOOS: darwin
   linux:

projects/libevent/build

@@ -10,7 +10,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
 [% END -%]
 ./autogen.sh
 ./configure [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --disable-openssl --prefix=$distdir
-[% IF c("var/osx") -%]
+[% IF c("var/macos") -%]
   export LD_PRELOAD=[% c("var/faketime_path") %]
   export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
 [% END -%]

projects/libevent/config

@@ -12,7 +12,7 @@ var:
   configure_opt_project: --disable-static
 
 targets:
-  osx:
+  macos:
     var:
       arch_deps:
         - faketime

projects/macosx-toolchain/build

@@ -11,7 +11,7 @@ tar -C $distdir -xf [% c('input_files_by_name/SDK') %]
 tar -C $distdir -xf [% c('input_files_by_name/cctools') %]
 tar -C $builddir -xf [% c('input_files_by_name/llvm-project') %]
 
-arch=[% c("var/osx_arch") %]
+arch=[% c("var/macos_arch") %]
 clangdir=$distdir/clang/bin
 cctoolsdir=$distdir/cctools/bin
 sysrootdir=$distdir/MacOSX[% c("version") %].sdk/
@@ -21,7 +21,7 @@ target=[% c("var/build_target") %]
 export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$cctoolsdir:$PATH"
 export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %]
 
-[% IF c("var/osx-aarch64") -%]
+[% IF c("var/macos-aarch64") -%]
   # wrapper taken from:
   # tor-browser.git/taskcluster/scripts/misc/build-llvm-common.sh
   clangwrappersdir=$distdir/clang/wrappers

projects/node/config

@@ -12,7 +12,7 @@ targets:
     var:
       arch_deps:
         - python2
-  osx:
+  macos:
     var:
       arch_deps:
         - python2

projects/openssl/build

@@ -9,7 +9,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
 export CC='gcc -m32'
 [% END %]
 # OpenSSL prepends the host triple to $CC
-[% IF c("var/osx") -%]
+[% IF c("var/macos") -%]
   # Tricking OpenSSL into using our clang as cross-compiler
   ln -s $clangdir/bin/clang $clangdir/bin/[% c("var/build_target") %]-cc
   export CC="cc [% c("var/FLAGS") %]"

projects/openssl/config

@@ -19,9 +19,9 @@ targets:
       flag_mwindows: ''
       configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"'
       openssldir: 'Program Files[% IF c("var/windows-i686") %] (x86)[% END %]/OpenSSL'
-  osx:
+  macos:
     var:
-      configure_opts: '--cross-compile-prefix=[% c("var/build_target") %]- darwin64-[% c("var/osx_arch") %]-cc enable-ec_nistp_64_gcc_128'
+      configure_opts: '--cross-compile-prefix=[% c("var/build_target") %]- darwin64-[% c("var/macos_arch") %]-cc enable-ec_nistp_64_gcc_128'
   android:
     var:
       configure_opts: 'CC=[% c("var/CC") %] android-[% c("var/toolchain_arch") %] -no-shared -D__ANDROID_API__=[% c("var/android_min_api") %]'

projects/rust/build

@@ -27,7 +27,7 @@ export PATH="$distdir-rust-prebuilt/bin:$PATH"
   export RUSTFLAGS="-L/var/tmp/dist/gcc/lib64"
 [% END -%]
 
-[% IF c("var/osx") %]
+[% IF c("var/macos") %]
   # We need to clear `CC` and `LDFLAGS` as they are used for the host platform
   # (i.e. Linux).
   unset CC
@@ -40,7 +40,7 @@ export PATH="$distdir-rust-prebuilt/bin:$PATH"
   cat > $distdir/helper/[% c("var/build_target") %]-clang << 'EOF'
 #!/bin/sh
 BASEDIR=/var/tmp/dist/macosx-toolchain
-$BASEDIR/cctools/bin/[% c("var/build_target") %]-clang -target [% c("var/build_target") %] -B $BASEDIR/cctools/bin -isysroot $sysrootdir -Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie [% IF c('var/osx-aarch64') %]-mcpu=apple-m1[% END %] "$@"
+$BASEDIR/cctools/bin/[% c("var/build_target") %]-clang -target [% c("var/build_target") %] -B $BASEDIR/cctools/bin -isysroot $sysrootdir -Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie [% IF c('var/macos-aarch64') %]-mcpu=apple-m1[% END %] "$@"
 EOF
 
   chmod +x $distdir/helper/[% c("var/build_target") %]-clang

projects/rust/config

@@ -56,7 +56,7 @@ targets:
       # binaries do.
       configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib --set target.i686-unknown-linux-gnu.linker=clang --set target.i686-unknown-linux-gnu.ar=llvm-ar --set target.i686-unknown-linux-gnu.ranlib=llvm-ranlib
 
-  osx:
+  macos:
     var:
       arch_deps:
         - libssl-dev