ClangForWindowsSettings : allow user to override LLVM's windows lib d…

…irectory
ubisoft · Apr 27, 2022 · 1fcec5f · 1fcec5f
1 parent 42e1448
commit 1fcec5f
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/ClangForWindowsSettings.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/ClangForWindowsSettings.cs
@@ -42,14 +42,27 @@ public static string GetWindowsClangIncludePath(DevEnv devEnv)
             return Path.Combine(Settings.LLVMInstallDirVsEmbedded(devEnv), "lib", "clang", Settings.ClangVersionVsEmbedded(devEnv), "include");
         }
 
-        public static string GetWindowsClangLibraryPath()
+        public static string GetWindowsClangLibraryPath(string libFolderName = null)
         {
-            return Path.Combine(Settings.LLVMInstallDir, "lib", "clang", Settings.ClangVersion, "lib", "windows");
+            return GetWindowsClangLibraryPath(Settings.LLVMInstallDir, Settings.ClangVersion, libFolderName);
         }
 
-        public static string GetWindowsClangLibraryPath(DevEnv devEnv)
+        public static string GetWindowsClangLibraryPath(DevEnv devEnv, string libFolderName = null)
         {
-            return Path.Combine(Settings.LLVMInstallDirVsEmbedded(devEnv), "lib", "clang", Settings.ClangVersionVsEmbedded(devEnv), "lib", "windows");
+            return GetWindowsClangLibraryPath(Settings.LLVMInstallDirVsEmbedded(devEnv), Settings.ClangVersionVsEmbedded(devEnv), libFolderName);
+        }
+
+        public static string GetWindowsClangLibraryPath(string llvmInstallDir, string clangVersion, string libFolderName = null)
+        {
+            if (libFolderName == null)
+            {
+                // Starting with LLVM 15, runtime library structure changes.
+                if (System.Version.Parse(clangVersion).Major >= 15)
+                    libFolderName = "x86_64-pc-windows-msvc";
+                else
+                    libFolderName = "windows";
+            }
+            return Path.Combine(llvmInstallDir, "lib", "clang", clangVersion, "lib", libFolderName);
         }
 
         public static class Settings