diff --git a/common.gypi b/common.gypi
index da9076c0044e21..75fd6880b471de 100644
--- a/common.gypi
+++ b/common.gypi
@@ -528,6 +528,10 @@
           }],
         ],
         'conditions': [
+          [ 'clang==1', {
+            'cflags_cc': [ '-std=gnu++20' ],
+            'cflags_cc!': [ '-std=gnu++17' ],
+          }],
           [ 'OS=="solaris"', {
             'cflags': [ '-pthreads' ],
             'ldflags': [ '-pthreads' ],
@@ -634,7 +638,7 @@
           ['clang==1', {
             'xcode_settings': {
               'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
-              'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++17',  # -std=gnu++17
+              'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++20',  # -std=gnu++20
               'CLANG_CXX_LIBRARY': 'libc++',
             },
           }],