diff --git a/base/llvm/llvm.SMBuild b/base/llvm/llvm.SMBuild
index 99e81a6..9727433 100755
--- a/base/llvm/llvm.SMBuild
+++ b/base/llvm/llvm.SMBuild
@@ -23,9 +23,9 @@ build() {
   mkdir -p smbuild && cd smbuild
 
   # Set build targets
-  if [ "$ARCH" = "x86_64" ] ; then
+  if [ "$arch" = "x86_64" ] ; then
     buildtarget='X86;AMDGPU;BPF'
-  elif [ "$ARCH" = "aarch64" ] ; then
+  elif [ "$arch" = "aarch64" ] ; then
     buildtarget="AArch64;ARM;BPF"
   fi
 
diff --git a/base/mozilla-nss/mozilla-nss.SMBuild b/base/mozilla-nss/mozilla-nss.SMBuild
index 902e884..a182258 100755
--- a/base/mozilla-nss/mozilla-nss.SMBuild
+++ b/base/mozilla-nss/mozilla-nss.SMBuild
@@ -20,7 +20,7 @@ build() {
   fixbuilddirpermissions
 
   # NSS doesn't like our ARM64-specific optimization C/CXXFLAGS
-  if [ "$ARCH" == "aarch64" ] ; then
+  if [ "$arch" == "aarch64" ] ; then
     unset CFLAGS CXXFLAGS
   fi
 
diff --git a/xorg/mesa/mesa.SMBuild b/xorg/mesa/mesa.SMBuild
index e9d71dd..0eb6cd8 100755
--- a/xorg/mesa/mesa.SMBuild
+++ b/xorg/mesa/mesa.SMBuild
@@ -21,11 +21,11 @@ build() {
 
   export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700"
 
-  if [ "$ARCH" = "aarch64" ]; then
+  if [ "$arch" = "aarch64" ]; then
     dridrivers=""
     galliumdrivers="vc4,v3d,kmsro"
 
-  elif [ "$ARCH" = "x86_64" ]; then
+  elif [ "$arch" = "x86_64" ]; then
     dridrivers="i915,i965,nouveau,r100,r200,swrast"
     galliumdrivers="nouveau,radeonsi,r300,r600"
   fi