From 50d5a1021623a89df035a1ef78557e0f1152648d Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 27 Apr 2022 13:51:30 -0400 Subject: Split out Artifact info (#2193) * #include an absolute path didn't work - because paths were taken to always be relative. * Compile to a dxil library. * Added CompileProduct. * Support handling of ModuleLibrary. * CacheBehavior -> Cache * Use CompileProduct for -r references. * CompileProduct -> Artifact. * Determining an artifact type on binding. * Determine binary linkability. * Added Artifact::exists. * Added ArtifactKeep. * Small fixes. * Small improvements to Artifact. * Add zip extension. * Fix some comments. * Fix multiple adding of PublicDecoration. Make public output export for DXIL/lib. Add checking for simpleDecorations such that only added once. * Use 'whole program' to identify library build. * Move slang-artifact into compiler-core. * Split out Keep free functions. * Artifact::Keep -> ArtifactKeep. * Handle libraries as artifacts. * Add -target dxil so test infrastructure knows it needs DXC. * Linking working in DXC. * Improve handling around emit for 'export'. * Add comment around Artifact name. * Render test working with linking. * Improvements around Artifact handling. * Add ArtifactPayloadInfo. * Small tidy up around artifact. * Split out code to get info about Artifacts into artifact-info.cpp/.h * Re-add slang-artifact.cpp * Readd artifact.cpp. --- source/compiler-core/slang-gcc-compiler-util.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/compiler-core/slang-gcc-compiler-util.cpp') diff --git a/source/compiler-core/slang-gcc-compiler-util.cpp b/source/compiler-core/slang-gcc-compiler-util.cpp index 2d1ad2555..554322198 100644 --- a/source/compiler-core/slang-gcc-compiler-util.cpp +++ b/source/compiler-core/slang-gcc-compiler-util.cpp @@ -10,6 +10,8 @@ #include "../core/slang-char-util.h" #include "../core/slang-string-slice-pool.h" +#include "slang-artifact-info.h" + namespace Slang { @@ -633,7 +635,7 @@ static SlangResult _parseGCCFamilyLine(const UnownedStringSlice& line, LineParse { const auto desc = artifact->getDesc(); // If it's a library for CPU types, try and use it - if (desc.isCpuBinary() && desc.kind == ArtifactKind::Library) + if (ArtifactInfoUtil::isCpuBinary(desc) && desc.kind == ArtifactKind::Library) { // Get the name and path (can be empty) to the library SLANG_RETURN_ON_FAIL(artifact->requireFileLike(ArtifactKeep::No)); -- cgit v1.2.3