Added using the Clang resource directory provided by ClangSharp.Patho…

…gen.Runtime. Fixes #201
MochiLibraries · Aug 26, 2021 · d10aa1b · d10aa1b
1 parent cc90cb1
commit d10aa1b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/Biohazrd/Biohazrd.csproj b/Biohazrd/Biohazrd.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="ClangSharp" Version="10.0.0-beta" />
-    <PackageReference Include="ClangSharp.Pathogen" Version="[0.0.0-ci41]" />
+    <PackageReference Include="ClangSharp.Pathogen" Version="[0.0.0-ci43]" />
     <!--
     -->
 

diff --git a/Biohazrd/TranslatedLibraryBuilder.cs b/Biohazrd/TranslatedLibraryBuilder.cs
@@ -1,4 +1,4 @@
-using ClangSharp;
+using ClangSharp;
 using ClangSharp.Interop;
 using ClangSharp.Pathogen;
 using System;
@@ -18,6 +18,22 @@ public sealed partial class TranslatedLibraryBuilder
 
         public TranslationOptions Options { get; set; } = new();
 
+        public TranslatedLibraryBuilder()
+        {
+            // On non-Windows platforms we need to provide the Clang resource directory.
+            // This specifies the version copied to our output directory by ClangSharp.Pathogen.Runtime.
+            // (One Windows the same files come from the UCRT instead.)
+            // See https://github.com/InfectedLibraries/Biohazrd/issues/201 for more details
+            string resourceDirectoryPath = Path.Combine(AppContext.BaseDirectory, "clang-resources");
+            if (!OperatingSystem.IsWindows())
+            {
+                if (!Directory.Exists(resourceDirectoryPath) || !File.Exists(Path.Combine(resourceDirectoryPath, "include", "stddef.h")))
+                { throw new DirectoryNotFoundException("Clang resources directory not found."); }
+
+                AddCommandLineArguments("-resource-dir", resourceDirectoryPath);
+            }
+        }
+
         public void AddFile(SourceFile sourceFile)
         {
             Debug.Assert(Path.IsPathFullyQualified(sourceFile.FilePath), "File paths should always be fully qualified.");

diff --git a/Tests/Biohazrd.Tests.Common/BiohazrdTestBase.cs b/Tests/Biohazrd.Tests.Common/BiohazrdTestBase.cs
@@ -21,11 +21,6 @@ protected TranslatedLibraryBuilder CreateLibraryBuilder(string cppCode, string?
                 Contents = cppCode
             });
 
-            //TODO: Figure out a better way to deal with this
-            // https://github.com/InfectedLibraries/Biohazrd/issues/201
-            if (OperatingSystem.IsLinux())
-            { builder.AddCommandLineArguments("-isystem/usr/lib/llvm-10/lib/clang/10.0.0/include/"); }
-
             if (targetTriple is not null)
             { builder.AddCommandLineArgument($"--target={targetTriple}"); }
 

diff --git a/Tests/Biohazrd.Tests/BasicTests.cs b/Tests/Biohazrd.Tests/BasicTests.cs
@@ -255,5 +255,21 @@ public void TranslateEvenWithParsingErrorsTrue()
             Assert.Contains(library.ParsingDiagnostics, d => d.IsError && d.IsFromClang);
             Assert.NotEmpty(library.Declarations);
         }
+
+        [Fact]
+        [RelatedIssue("https://github.com/InfectedLibraries/Biohazrd/issues/201")]
+        public void ClangFindsSystemIncludes()
+        {
+            // On Windows stddef.h will be found from the UCRT.
+            // On Linux it needs to come from the Clang resource directory.
+            TranslatedLibrary library = CreateLibrary
+            (
+                @"
+#include <stddef.h>
+size_t Test();
+"
+            );
+            library.FindDeclaration<TranslatedFunction>("Test");
+        }
     }
 }