From 7baa7fa1aa724c4d6302005c8ecc68a77251049e Mon Sep 17 00:00:00 2001
From: Alex Schwartz <alexschwartz01@gmail.com>
Date: Tue, 12 May 2026 15:35:27 -0400
Subject: [PATCH] feat: statically link libatomic for Linux Clang builds

---
 node.gyp                 | 2 +-
 tools/v8_gypfiles/v8.gyp | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/node.gyp b/node.gyp
index c06e95a98e5ce9..ec30a67f5fe83b 100644
--- a/node.gyp
+++ b/node.gyp
@@ -563,7 +563,7 @@
         ],
       }],
       ['OS=="linux" and clang==1', {
-        'libraries': ['-latomic'],
+        'libraries': ['<!@(clang++ -print-file-name=libatomic.a)'],
       }],
     ],
   },
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 945aa0aa501df1..31c1476ad8a4fc 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -1334,11 +1334,17 @@
         # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
         # to implement atomic memory access.
         # Clang needs it for some atomic operations (https://clang.llvm.org/docs/Toolchain.html#atomics-library).
-        ['(OS=="linux" and clang==1) or (v8_current_cpu in ["mips64", "mips64el", "arm", "riscv64", "loong64"])', {
+        ['(OS!="linux" or clang!=1) and (v8_current_cpu in ["mips64", "mips64el", "arm", "riscv64", "loong64"])', {
           'link_settings': {
             'libraries': ['-latomic', ],
           },
         }],
+        # Statically link libatomic for Linux Clang builds
+        ['OS=="linux" and clang==1', {
+          'link_settings': {
+            'libraries': ['<!@(clang++ -print-file-name=libatomic.a)', ],
+          },
+        }],
       ],
     },  # v8_base_without_compiler
     {