From 02544578a77f57624179e5e23a06a9faaa2db365 Mon Sep 17 00:00:00 2001
From: Eric Niebler <eniebler@nvidia.com>
Date: Mon, 4 May 2026 14:08:24 -0700
Subject: [PATCH] extend the `__mmangle_t` workaround to clang < 18

---
 include/stdexec/__detail/__meta.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/stdexec/__detail/__meta.hpp b/include/stdexec/__detail/__meta.hpp
index a73363b8c..94f2378e9 100644
--- a/include/stdexec/__detail/__meta.hpp
+++ b/include/stdexec/__detail/__meta.hpp
@@ -414,9 +414,9 @@ namespace STDEXEC
   template <template <class...> class _Fn, class... _Args>
   using __mmemoize_q = __mmemoize<__q<_Fn>, _Args...>;
 
-#if STDEXEC_GCC()
-  // GCC can not mangle builtins. __mangle_t introduces an
-  // indirection that hides the builtin from the mangler.
+#if STDEXEC_GCC() || (STDEXEC_CLANG() && STDEXEC_CLANG_VERSION < 1800)
+  // GCC and Clang < 18 cannot mangle builtins. __mmangle_t introduces an indirection
+  // that hides the builtin from the mangler.
   template <template <class...> class _Fn, class... _Args>
   using __mmangle_t = __mmemoize_q<_Fn, _Args...>;
 #else