From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 15 Feb 2022 04:46:48 +0000 (+0000)
Subject: Build swgl with clang rather than gcc to avoid internal compiler error.
X-Git-Tag: archive/raspbian/91.6.0esr-1_deb10u1+rpi1~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=19366e4892794b06a3aa6d9087c2e92a6c246dee;p=firefox-esr.git

Build swgl with clang rather than gcc to avoid internal compiler error.
---

diff --git a/debian/changelog b/debian/changelog
index 3e25619f873..f64d046e3a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,10 @@ firefox-esr (91.6.0esr-1~deb10u1+rpi1) buster-staging; urgency=medium
   * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting
     definitions error.
 
- -- Raspbian forward porter <root@raspbian.org>  Sun, 13 Feb 2022 13:05:44 +0000
+  [changes introduced in 91.6.0esr-1~deb10u1+rpi1 by Peter Michael Green]
+  * Build swgl with clang rather than gcc to avoid internal compiler error.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 15 Feb 2022 04:45:41 +0000
 
 firefox-esr (91.6.0esr-1~deb10u1) buster-security; urgency=medium
 
diff --git a/gfx/wr/swgl/build.rs b/gfx/wr/swgl/build.rs
index 8ace5615a28..477b7c066f8 100644
--- a/gfx/wr/swgl/build.rs
+++ b/gfx/wr/swgl/build.rs
@@ -129,6 +129,12 @@ fn main() {
 
     shaders.sort();
 
+    // force build with clang to work around internal compiler error in gcc
+    if let Ok(target) = std::env::var("TARGET") {
+        std::env::set_var(format!("CC_{}", target),"clang");
+        std::env::set_var(format!("CXX_{}", target),"clang++");
+    }
+
     // We need to ensure that the C preprocessor does not pull compiler flags from
     // the host or target environment. Set up a SWGLPP target with empty flags to
     // work around this.