From 39522159c245e32a99cfdc47f03236f7028f5c61 Mon Sep 17 00:00:00 2001 From: Yong He Date: Mon, 26 Feb 2024 17:00:31 -0800 Subject: Allow default values for `extern` symbols. (#3632) * Allow default values for `extern` symbols. * Fix. * Fix test. --- source/slang/slang.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/slang/slang.cpp') diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index bc91622f0..9a653aded 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -2907,7 +2907,6 @@ SlangResult EndToEndCompileRequest::executeActionsInner() // for (auto targetReq : getLinkage()->targets) { - targetReq->getOptionSet().inheritFrom(getLinkage()->m_optionSet); auto targetProgram = m_specializedGlobalAndEntryPointsComponentType->getTargetProgram(targetReq); targetProgram->getOrCreateLayout(getSink()); } @@ -3559,6 +3558,8 @@ bool Linkage::isBinaryModuleUpToDate(String fromPath, RiffContainer* container) auto& moduleHeader = containerData.modules[0]; DigestBuilder digestBuilder; + auto version = String(getBuildTagString()); + digestBuilder.append(version); m_optionSet.buildHash(digestBuilder); for (auto file : moduleHeader.dependentFiles) { -- cgit v1.2.3