From 0160eb2a5978d9361cfee83f23db34f88dfdd4c0 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 12 Jan 2022 21:48:20 +0000
Subject: [PATCH] Bug 1747773 - Build NSS with clang's integrated assembler on
 x86_64. r=firefox-build-system-reviewers,mhentges

Differential Revision: https://phabricator.services.mozilla.com/D134742
---
 security/moz.build | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/security/moz.build b/security/moz.build
index 010f62714a0d..a3f08fd0c024 100644
--- a/security/moz.build
+++ b/security/moz.build
@@ -96,6 +96,14 @@ gyp_vars["use_system_sqlite"] = 1
 gyp_vars["sqlite_libs"] = "sqlite"
 gyp_vars["enable_draft_hpke"] = 1
 
+# Clang can build NSS with its integrated assembler since version 9.
+if (
+    CONFIG["CPU_ARCH"] == "x86_64"
+    and CONFIG["CC_TYPE"] == "clang"
+    and int(CONFIG["CC_VERSION"].split(".")[0]) >= 9
+):
+    gyp_vars["force_integrated_as"] = 1
+
 
 if CONFIG["MOZ_SYSTEM_NSPR"]:
     gyp_vars["nspr_include_dir"] = "%" + CONFIG["NSPR_INCLUDE_DIR"]