1 files changed, 5 insertions, 8 deletions
diff --git a/source/slang/slang-emit-hlsl.cpp b/source/slang/slang-emit-hlsl.cpp
index 059a3f641..03566f9df 100644
--- a/source/slang/slang-emit-hlsl.cpp
+++ b/source/slang/slang-emit-hlsl.cpp
@@ -739,14 +739,11 @@ void HLSLSourceEmitter::emitFuncDecorationImpl(IRDecoration* decoration)
         const auto stage = profile.getStage();
         const auto version = profile.getVersion();
 
-        // I would perhaps ideally know that this was being compiled for 'library' stage.
-        // Stage::Unknown is currently also used for lib profiles.
-
-        // TODO(JS): Potentially can do export for fxc too, but for now we don't add.
-        
-        if (family == ProfileFamily::DX &&
-            version >= ProfileVersion::DX_6_1 &&
-            stage == Stage::Unknown)
+        // If it's whole program and it's for a late enough version of shader model
+        // output with 'export'
+        if (getTargetReq()->isWholeProgramRequest() &&
+            family == ProfileFamily::DX &&
+            version >= ProfileVersion::DX_6_1)
         {
             m_writer->emit("export\n");
         }