diff --git a/configure.py b/configure.py
index a752897e90a..336cb0a2d19 100755
--- a/configure.py
+++ b/configure.py
@@ -1190,9 +1190,7 @@ def get_gas_version(cc):
   try:
     custom_env = os.environ.copy()
     custom_env["LC_ALL"] = "C"
-    proc = subprocess.Popen(shlex.split(cc) + ['-Wa,-v', '-c', '-o',
-                                               '/dev/null', '-x',
-                                               'assembler',  '/dev/null'],
+    proc = subprocess.Popen(shlex.split(cc) + ['-v', '/dev/null'],
                             stdin=subprocess.PIPE, stderr=subprocess.PIPE,
                             stdout=subprocess.PIPE, env=custom_env)
   except OSError:
@@ -1329,6 +1327,7 @@ def check_compiler(o):
   if is_clang:
     if sys.platform == 'darwin':
       o['variables']['xcode_version'] = get_xcode_version(CC)
+    o['variables']['gas_version'] = get_gas_version("as")
   else:
     o['variables']['gas_version'] = get_gas_version(CC)

diff --git a/deps/simdjson/simdjson.gyp b/deps/simdjson/simdjson.gyp
index 5c5707a7de2..8ba2ae1e8cf 100644
--- a/deps/simdjson/simdjson.gyp
+++ b/deps/simdjson/simdjson.gyp
@@ -15,6 +15,7 @@
        'sources': [
          '<@(simdjson_sources)',
        ],
+       'defines': [ 'SIMDJSON_IMPLEMENTATION_ICELAKE=0', 'SIMDJSON_IMPLEMENTATION_HASWELL=0', 'SIMDJSON_IMPLEMENTATION_WESTMERE=0' ],
      },
   ]
 }
diff --git a/node.gypi b/node.gypi
index 667deb50577..9f86ad5edf3 100644
--- a/node.gypi
+++ b/node.gypi
@@ -387,9 +387,9 @@
             './deps/ngtcp2/ngtcp2.gyp:nghttp3',

             # For tests
-            './deps/openssl/openssl.gyp:openssl-cli',
-            './deps/ngtcp2/ngtcp2.gyp:ngtcp2_test_server',
-            './deps/ngtcp2/ngtcp2.gyp:ngtcp2_test_client',
+            #'./deps/openssl/openssl.gyp:openssl-cli',
+            #'./deps/ngtcp2/ngtcp2.gyp:ngtcp2_test_server',
+            #'./deps/ngtcp2/ngtcp2.gyp:ngtcp2_test_client',
           ],
           'conditions': [
             # -force_load or --whole-archive are not applicable for
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index c3ec7e3ee92..baed607872b 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -2371,6 +2371,7 @@
         ],
       },
       'include_dirs': ['.'],
+      'defines': [ "SIMDUTF_IMPLEMENTATION_ICELAKE=0", 'SIMDUTF_IMPLEMENTATION_HASWELL=0', 'SIMDUTF_IMPLEMENTATION_WESTMERE=0' ],
       'sources': [
         '<(V8_ROOT)/third_party/simdutf/simdutf.cpp',
       ],