Browse Source

Skip validator version check when linking to lib target.

Tex Riddell 7 years ago
parent
commit
efa99e75ec
1 changed files with 11 additions and 7 deletions
  1. 11 7
      lib/HLSL/DxilLinker.cpp

+ 11 - 7
lib/HLSL/DxilLinker.cpp

@@ -1003,13 +1003,17 @@ std::unique_ptr<llvm::Module> DxilLinkerImpl::Link(StringRef entry,
     // Invalid profile.
     return nullptr;
   }
-  // Verifying validator version supports the requested profile
-  unsigned minValMajor, minValMinor;
-  pSM->GetMinValidatorVersion(minValMajor, minValMinor);
-  if (minValMajor > m_valMajor ||
-      (minValMajor == m_valMajor && minValMinor > m_valMinor)) {
-    m_ctx.emitError(Twine(kInvalidValidatorVersion) + profile);
-    return nullptr;
+
+  // Skip validation for lib target until implemented.
+  if (!pSM->IsLib()) {
+    // Verifying validator version supports the requested profile
+    unsigned minValMajor, minValMinor;
+    pSM->GetMinValidatorVersion(minValMajor, minValMinor);
+    if (minValMajor > m_valMajor ||
+        (minValMajor == m_valMajor && minValMinor > m_valMinor)) {
+      m_ctx.emitError(Twine(kInvalidValidatorVersion) + profile);
+      return nullptr;
+    }
   }
 
   DxilLinkJob linkJob(m_ctx, m_valMajor, m_valMinor);