From 54c91cb6376b7542f59facd923684205b6ded688 Mon Sep 17 00:00:00 2001
From: Javernaut <javernaut@gmail.com>
Date: Sun, 8 Dec 2019 08:31:47 +0200
Subject: [PATCH] Minor wording correction

---
 scripts/export-build-variables.sh | 3 ++-
 scripts/export-host-variables.sh  | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/export-build-variables.sh b/scripts/export-build-variables.sh
index a69e914..276b942 100755
--- a/scripts/export-build-variables.sh
+++ b/scripts/export-build-variables.sh
@@ -56,6 +56,7 @@ export CROSS_PREFIX=${TARGET_TRIPLE_MACHINE_BINUTILS}-linux-${TARGET_TRIPLE_OS}-
 export CROSS_PREFIX_WITH_PATH=${TOOLCHAIN_PATH}/bin/${CROSS_PREFIX}
 
 # Exporting Binutils paths, if passing just CROSS_PREFIX_WITH_PATH is not enough
+# The FAM_ prefix is used to eliminate passing those values implicitly to build systems
 export FAM_ADDR2LINE=${CROSS_PREFIX_WITH_PATH}addr2line
 export        FAM_AR=${CROSS_PREFIX_WITH_PATH}ar
 export        FAM_AS=${CROSS_PREFIX_WITH_PATH}as
@@ -78,7 +79,7 @@ export FAM_CC=${TOOLCHAIN_PATH}/bin/${TARGET}-clang
 export FAM_CXX=${FAM_CC}++
 # TODO consider abondaning this strategy of defining the name of the clang wrapper
 # in favour of just passing -mstackrealign and -fno-addrsig depending on
-# ANDROID_ABI and NDK's version
+# ANDROID_ABI, ANDROID_PLATFORM and NDK's version
 
 # Special variable for the yasm assembler
 export FAM_YASM=${TOOLCHAIN_PATH}/bin/yasm
diff --git a/scripts/export-host-variables.sh b/scripts/export-host-variables.sh
index 5d4f14a..078d0a1 100755
--- a/scripts/export-host-variables.sh
+++ b/scripts/export-host-variables.sh
@@ -27,5 +27,7 @@ export HOST_NPROC=$HOST_NPROC
 export CMAKE_EXECUTABLE=${ANDROID_SDK_HOME}/cmake/3.10.2.4988404/bin/cmake
 # Using Ninja from the Android SDK
 export NINJA_EXECUTABLE=${ANDROID_SDK_HOME}/cmake/3.10.2.4988404/bin/ninja
-# Using host Make, because Android NDK's Make (before r21) doesn't work properly on MSYS2 in Windows
+# Using host Make, because Android NDK's Make (before r21) doesn't work properly in MSYS2 on Windows
 export MAKE_EXECUTABLE=make
+# Meson is used for libdav1d building
+export MESON_EXECUTABLE=meson