diff --git a/common.gypi b/common.gypi
index b5a1bcad695..3c73151315d 100644
--- a/common.gypi
+++ b/common.gypi
@@ -107,7 +107,6 @@
         'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a',
       }],
       ['OS=="mac"', {
-        'clang%': 1,
         'obj_dir%': '<(PRODUCT_DIR)/obj.target',
         'v8_base': '<(PRODUCT_DIR)/libv8_snapshot.a',
       }],
@@ -182,10 +181,10 @@
             }, {
               'MSVC_runtimeType': 2   # MultiThreadedDLL (/MD)
             }],
-            ['llvm_version=="0.0"', {
-              'lto': ' -flto=4 -fuse-linker-plugin -ffat-lto-objects ', # GCC
-            }, {
+            ['clang==1', {
               'lto': ' -flto ', # Clang
+            }, {
+              'lto': ' -flto=4 -fuse-linker-plugin -ffat-lto-objects ', # GCC
             }],
           ],
         },
diff --git a/configure.py b/configure.py
index 1d7c095d03d..a8e48d08bc0 100755
--- a/configure.py
+++ b/configure.py
@@ -1042,6 +1042,7 @@ def get_gas_version(cc):
 # quite prepared to go that far yet.
 def check_compiler(o):
   if sys.platform == 'win32':
+    o['variables']['clang'] = 0
     o['variables']['llvm_version'] = '0.0'
     if not options.openssl_no_asm and options.dest_cpu in ('x86', 'x64'):
       nasm_version = get_nasm_version('nasm')
@@ -1051,6 +1052,7 @@ def check_compiler(o):
     return
 
   ok, is_clang, clang_version, gcc_version = try_check_compiler(CXX, 'c++')
+  o['variables']['clang'] = B(is_clang)
   version_str = ".".join(map(str, clang_version if is_clang else gcc_version))
   print_verbose(f"Detected {'clang ' if is_clang else ''}C++ compiler (CXX={CXX}) version: {version_str}")
   if not ok:
diff --git a/deps/openssl/openssl_common.gypi b/deps/openssl/openssl_common.gypi
index 8745ec130ab..4312359e947 100644
--- a/deps/openssl/openssl_common.gypi
+++ b/deps/openssl/openssl_common.gypi
@@ -67,7 +67,7 @@
         'TERMIOS',
       ],
       'conditions': [
-        [ 'llvm_version=="0.0"', {
+        [ 'clang==0', {
           'cflags': ['-Wno-old-style-declaration',],
         }],
       ],
diff --git a/deps/zlib/zlib.gyp b/deps/zlib/zlib.gyp
index 26ceed9fbe6..25f570fbe7b 100644
--- a/deps/zlib/zlib.gyp
+++ b/deps/zlib/zlib.gyp
@@ -7,7 +7,6 @@
     'ZLIB_ROOT': '.',
     'use_system_zlib%': 0,
     'arm_fpu%': '',
-    'llvm_version%': '0.0',
   },
   'conditions': [
     ['use_system_zlib==0', {
@@ -24,7 +23,7 @@
                 },{
                   'defines': [ 'X86_NOT_WINDOWS' ],
                 }],
-                ['OS!="win" or llvm_version!="0.0"', {
+                ['OS!="win" or clang==1', {
                   'cflags': [ '-mssse3' ],
                   'xcode_settings': {
                     'OTHER_CFLAGS': [ '-mssse3' ],
@@ -65,7 +64,7 @@
           'conditions': [
             ['OS!="ios"', {
               'conditions': [
-                ['OS!="win" and llvm_version=="0.0"', {
+                ['OS!="win" and clang==0', {
                   'cflags': [ '-march=armv8-a+aes+crc' ],
                 }],
                 ['OS=="android"', {
@@ -111,7 +110,7 @@
         #   'target_name': 'zlib_crc32_simd',
         #   'type': 'static_library',
         #   'conditions': [
-        #     ['OS!="win" or llvm_version!="0.0"', {
+        #     ['OS!="win" or clang==1', {
         #       'cflags': [
         #         '-msse4.2',
         #         '-mpclmul',
diff --git a/node.gyp b/node.gyp
index 6244369405e..a994c3d3ee3 100644
--- a/node.gyp
+++ b/node.gyp
@@ -504,7 +504,7 @@
           '-Wl,-bnoerrmsg',
         ],
       }],
-      ['OS == "linux" and llvm_version != "0.0"', {
+      ['OS=="linux" and clang==1', {
         'libraries': ['-latomic'],
       }],
     ],
diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi
index cc97adfbc30..e4dd387014e 100644
--- a/tools/v8_gypfiles/toolchain.gypi
+++ b/tools/v8_gypfiles/toolchain.gypi
@@ -134,7 +134,7 @@
       '<(V8_ROOT)/include',
     ],
     'conditions': [
-      ['clang', {
+      ['clang==1', {
         'cflags': [ '-Werror', '-Wno-unknown-pragmas' ],
       },{
         'cflags!': [ '-Wall', '-Wextra' ],
@@ -144,7 +144,7 @@
           '-flax-vector-conversions',
         ],
       }],
-      ['clang or OS!="win"', {
+      ['clang==1 or OS!="win"', {
         'cflags': [ '-Wno-invalid-offsetof' ],
         'xcode_settings': {
           'WARNING_CFLAGS': ['-Wno-invalid-offsetof']
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 1e2b3645132..fa84690ba79 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -1879,7 +1879,7 @@
           ['enable_lto=="true"', {
             'cflags_cc': [ '-fno-lto' ],
           }],
-          ['clang or OS!="win"', {
+          ['clang==1 or OS!="win"', {
             'conditions': [
               ['_toolset == "host" and host_arch == "x64" or _toolset == "target" and target_arch=="x64"', {
                 'sources': [