1 files changed, 10 insertions, 1 deletions
diff --git a/source/slang/slang-compiler.cpp b/source/slang/slang-compiler.cpp
index 881194bcb..789103ff8 100644
--- a/source/slang/slang-compiler.cpp
+++ b/source/slang/slang-compiler.cpp
@@ -1285,7 +1285,13 @@ void printDiagnosticArg(StringBuilder& sb, CodeGenTarget val)
             if (_isCPUHostTarget(target))
             {
                 options.libraryPaths.add(Path::getParentDirectory(Path::getExecutablePath()));
-                options.libraries.add("slang-rt");
+
+                // Set up the library artifact
+                const ArtifactDesc desc = ArtifactDesc::make(ArtifactKind::Library, Artifact::Payload::HostCPU, ArtifactStyle::Unknown);
+                RefPtr<Artifact> artifact = new Artifact(desc);
+                artifact->setPath(Artifact::PathType::Existing, "slang-rt");
+
+                options.libraries.add(artifact);
             }
         }
 
@@ -1386,6 +1392,9 @@ void printDiagnosticArg(StringBuilder& sb, CodeGenTarget val)
                     options.defines.add(define);
                 }
             }
+
+            // Add all of the module libraries
+            options.libraries.addRange(linkage->m_libModules.getBuffer(), linkage->m_libModules.getCount());
         }
 
         // Compile