See PR made by @justinh2002 to Upstream spack: https://github.com/spack/spack/pull/50606 Relevant commit hash to be cherry picked into our spack repo: commit 0a487dfd2e50b9d821791b84211dd04fa6dbe680