From 1ef1e1f5bdab29771ab3fd923b06fd6f8f25774e Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Tue, 2 Aug 2022 10:19:55 -0700
Subject: [PATCH] devops: fix firefox arm64 builds (#16157)

Turns out the `/etc/environment` is not read for non-login shells,
so we have to source rust & cargo installation explicitly.
---
 browser_patches/docker_build.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/browser_patches/docker_build.sh b/browser_patches/docker_build.sh
index 503d4ce133..9a84c27a6b 100755
--- a/browser_patches/docker_build.sh
+++ b/browser_patches/docker_build.sh
@@ -212,6 +212,11 @@ elif [[ "$2" == "compile" ]]; then
       export CC=/usr/bin/clang-12
       export CXX=/usr/bin/clang++-12
     fi
+    # For non-login non-interactive shells, we have to source
+    # cargo env explicitly since /env/environment is not read.
+    if [[ -f "$HOME/.cargo/env" ]]; then
+      source "$HOME/.cargo/env"
+    fi
     ./browser_patches/checkout_build_archive_upload.sh "${BUILD_FLAVOR}"
   '
 elif [[ "$2" == "enter" || -z "$2" ]]; then