From 5f89cabd4139e2672cd1fceb05db5861920f70ad Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@chromium.org>
Date: Sun, 1 Oct 2023 22:53:01 -0400
Subject: [PATCH] Disable non-templaet-friend warning in GCC since it's firing
 in LLVM

---
 .github/workflows/ci.yml                                 | 8 ++++++++
 .github/workflows/try.yml                                | 8 ++++++++
 subdoc/gen_tests/typenames-across-paths/namespace.n.html | 2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73139ea64..fd07be9a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -128,6 +128,14 @@ jobs:
           sudo apt-get install g++-13
           echo "CXXFLAGS=$CXXFLAGS" >> $GITHUB_ENV
 
+      # GCC has a warning on the LLVM 18 codebase now.
+      # https://github.com/llvm/llvm-project/issues/67942
+      - name: Disable GCC Warning
+        if: matrix.config.name == 'Ubuntu GCC'
+        run: |
+          echo "CFLAGS=$CFLAGS -Wno-non-template-friend" >> $GITHUB_ENV
+          echo "CXXFLAGS=$CXXFLAGS -Wno-non-template-friend" >> $GITHUB_ENV
+
       # vptr is incompatible with no-rtti. We turn off rtti to match the LLVM libraries.
       - name: Set Sanitizer Flags
         if: endsWith(matrix.config.name, 'Sanitizer')
diff --git a/.github/workflows/try.yml b/.github/workflows/try.yml
index 45d2e8ea0..25b778489 100644
--- a/.github/workflows/try.yml
+++ b/.github/workflows/try.yml
@@ -138,6 +138,14 @@ jobs:
           echo "CFLAGS=$CFLAGS -fsanitize=address -fsanitize=undefined -fno-sanitize=vptr -O0" >> $GITHUB_ENV
           echo "CXXFLAGS=$CXXFLAGS -fsanitize=address -fsanitize=undefined -fno-sanitize=vptr -O0" >> $GITHUB_ENV
 
+      # GCC has a warning on the LLVM 18 codebase now.
+      # https://github.com/llvm/llvm-project/issues/67942
+      - name: Disable GCC Warning
+        if: matrix.config.name == 'Ubuntu GCC'
+        run: |
+          echo "CFLAGS=$CFLAGS -Wno-non-template-friend" >> $GITHUB_ENV
+          echo "CXXFLAGS=$CXXFLAGS -Wno-non-template-friend" >> $GITHUB_ENV
+
       - name: Download Ninja
         id: ninja
         shell: cmake -P {0}
diff --git a/subdoc/gen_tests/typenames-across-paths/namespace.n.html b/subdoc/gen_tests/typenames-across-paths/namespace.n.html
index c6198ed60..71c17dcbd 100644
--- a/subdoc/gen_tests/typenames-across-paths/namespace.n.html
+++ b/subdoc/gen_tests/typenames-across-paths/namespace.n.html
@@ -273,7 +273,7 @@
               <div class="type-signature"><a name="alias.var"></a><a class="type-name" href="other-namespace.subother.html#variable.var">var</a></div>
             </div>
             <div class="description short">
-              <p>Forwarding alias of <a href="other-namespace.subother.html#variable.var"><code>var</code></a>.</p>
+              <p>Deduces to <code>int var</code>.</p>
             </div>
           </li>
         </ul>