diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 4a47b2ed54..74de33bd49 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -38,7 +38,7 @@ if (${ENABLE_SPIRV_CODEGEN})
   endif()
 
   set(SPIRV_DEP_TARGETS
-    SPIRV-Tools
+    SPIRV-Tools-static
     SPIRV-Tools-opt
   )
 
diff --git a/external/SPIRV-Headers b/external/SPIRV-Headers
index ac638f1815..3fdabd0da2 160000
--- a/external/SPIRV-Headers
+++ b/external/SPIRV-Headers
@@ -1 +1 @@
-Subproject commit ac638f1815425403e946d0ab78bac71d2bdbf3be
+Subproject commit 3fdabd0da2932c276b25b9b4a988ba134eba1aa6
diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools
index fc0dc3a9c7..13a65b1aee 160000
--- a/external/SPIRV-Tools
+++ b/external/SPIRV-Tools
@@ -1 +1 @@
-Subproject commit fc0dc3a9c734f798f85a8433cbd99306dbe82825
+Subproject commit 13a65b1aee425a97b9ca73d81212d99fd2bf9227