(llvm) add runtime dirs to runenvs (for asan and libunwind)

Author: Arthapz

xmake/modules/core/tools/clang.lua

@@ -227,7 +227,7 @@ function nf_runtime(self, runtime, opt)
     -- @see https://discourse.llvm.org/t/improve-autolinking-of-compiler-rt-and-libc-on-windows-with-lld-link/71392/10
     -- and need manual setting of libc++ headerdirectory 
     -- @see https://github.com/llvm/llvm-project/issues/79647
-    local llvm_dirs = toolchain_utils.get_llvm_dirs(self)
+    local llvm_dirs = toolchain_utils.get_llvm_dirs(self:toolchain(), self:toolchain():sdkdir())
 
     if self:is_plat("windows") and runtime == "c++_shared" then
         if llvm_dirs.bin then

xmake/modules/private/utils/toolchain.lua

@@ -185,7 +185,7 @@ end
 function _get_llvm_resourcedir(toolchain)
     local llvm_resourcedir = _g._LLVM_resourceDIR
     if llvm_resourcedir == nil then
-        local outdata = try { function() return os.iorunv(toolchain:get("cc"), {"-print-resource-dir"}, {envs = toolchain:runenvs()}) end }
+        local outdata = try { function() return os.iorunv(toolchain:tool("cc"), {"-print-resource-dir"}, {envs = toolchain:runenvs()}) end }
         if outdata then
             llvm_resourcedir = path.normalize(outdata:trim())
             if not os.isdir(llvm_resourcedir) then
@@ -198,10 +198,10 @@ function _get_llvm_resourcedir(toolchain)
 end
 
 -- get llvm sdk root directory
-function _get_llvm_rootdir(self)
+function _get_llvm_rootdir(toolchain)
     local llvm_rootdir = _g._LLVM_ROOTDIR
     if llvm_rootdir == nil then
-        local resourcedir = _get_llvm_resourcedir(self)
+        local resourcedir = _get_llvm_resourcedir(toolchain)
         if resourcedir then
             llvm_rootdir = path.normalize(path.join(resourcedir, "..", "..", ".."))
             if not os.isdir(llvm_rootdir) then
@@ -214,40 +214,50 @@ function _get_llvm_rootdir(self)
 end
 
 -- find compiler-rt dir
-function _get_llvm_compiler_win_rtdir_and_link(self, target)
+function _get_llvm_compiler_rtdir_and_link(toolchain)
     import("lib.detect.find_tool")
 
-    local cc = self:get("cc")
+    local cc = toolchain:tool("cc")
     local cc_tool = find_tool(cc, {version = true})
     if cc_tool and cc_tool.version then
-        local resdir = _get_llvm_resourcedir(self)
+        local resdir = _get_llvm_resourcedir(toolchain)
         if resdir  then
             local res_libdir = path.join(resdir, "lib")
             -- when -DLLVM_ENABLE_TARGET_RUNTIME_DIR=OFF rtdir is windows/ and rtlink is clang_rt.builtinsi_<arch>.lib  
             -- when ON rtdir is windows/<target-triple> and rtlink is clang_rt.builtins.lib
-            local target_triple = _get_llvm_target_triple(self)
+            local target_triple = _get_llvm_target_triple(toolchain)
             local arch = target_triple and target_triple:split("-")[1]
 
+            local plat
+            if toolchain:is_plat("windows") then
+                plat = "windows"
+            elseif toolchain:is_plat("linux") then
+                plat = "linux"
+            elseif toolchain:is_plat("macosx", "ios", "watchos", "appletvos", "applexros") then
+                plat = "darwin"
+            end
+
+            
             local tripletdir = target_triple and path.join(res_libdir, "windows", target_triple)
             tripletdir = os.isdir(tripletdir) or nil
 
-            local rtdir = tripletdir and path.join("windows", target_triple) or "windows"
-            if os.isdir(path.join(res_libdir, rtdir)) then
+            local rtdir = tripletdir and path.join(plat, target_triple) or plat
+            if os.isdir(path.join(res_libdir, rtdir)) and toolchain:is_plat("windows") then
                 local rtlink = "clang_rt.builtins" .. (tripletdir and ".lib" or ("-" .. arch .. ".lib"))
                 if os.isfile(path.join(res_libdir, rtdir, rtlink)) then
-                    return res_libdir, path.join(rtdir, rtlink)
+                    return res_libdir, path.join(rtdir, rtlink), path.join(res_libdir, rtdir)
                 end
             end
-            return res_libdir
+            return res_libdir, nil, path.join(res_libdir, rtdir)
         end
     end
 end
 
 -- get llvm target triple
-function _get_llvm_target_triple(self)
+function _get_llvm_target_triple(toolchain)
     local llvm_targettriple = _g._LLVM_TARGETTRIPLE
     if llvm_targettriple == nil then
-        local outdata = try { function() return os.iorunv(self:program(), {"-print-target-triple"}, {envs = self:runenvs()}) end }
+        local outdata = try { function() return os.iorunv(toolchain:tool("cc"), {"-print-target-triple"}, {envs = toolchain:runenvs()}) end }
         if outdata then
             llvm_targettriple = outdata:trim()
         end
@@ -257,49 +267,40 @@ function _get_llvm_target_triple(self)
 end
 
 -- get llvm toolchain dirs
-function get_llvm_dirs(toolchain)
+function get_llvm_dirs(toolchain, rootdir)
     local llvm_dirs = _g.llvm_dirs
     if llvm_dirs == nil then
-        local rootdir = toolchain:sdkdir()
         if not rootdir and toolchain:is_plat("windows") then
             rootdir = _get_llvm_rootdir(toolchain)
         end
 
         local bindir, libdir, cxxlibdir, includedir, cxxincludedir, resdir, rtdir, rtlink
         if rootdir then
             bindir = path.join(rootdir, "bin")
-            if bindir then
-                bindir = os.isdir(bindir) and bindir or nil
-            end
+            bindir = os.isdir(bindir) and bindir or nil
 
             libdir = path.join(rootdir, "lib")
-            if libdir then
-                libdir = os.isdir(libdir) and libdir or nil
-            end
+            libdir = os.isdir(libdir) and libdir or nil
 
             if libdir then
-                cxxlibdir = libdir and path.join(libdir, "c++")
-                if cxxlibdir then
+                cxxlibdir = path.join(libdir, "c++")
+                cxxlibdir = os.isdir(cxxlibdir) and cxxlibdir or nil
+                if not cxxlibdir then
+                    cxxlibdir = path.join(libdir, _get_llvm_target_triple(toolchain))
                     cxxlibdir = os.isdir(cxxlibdir) and cxxlibdir or nil
                 end
             end
 
             includedir = path.join(rootdir, "include")
-            if includedir then
-                includedir = os.isdir(includedir) and includedir or nil
-            end
+            includedir = os.isdir(includedir) and includedir or nil
 
             if includedir then
-                cxxincludedir = includedir and path.join(includedir, "c++", "v1") or nil
-                if cxxincludedir then
-                    cxxincludedir = os.isdir(cxxincludedir) and cxxincludedir or nil
-                end
+                cxxincludedir = path.join(includedir, "c++", "v1")
+                cxxincludedir = os.isdir(cxxincludedir) and cxxincludedir or nil
             end
 
             resdir = _get_llvm_resourcedir(toolchain)
-            if toolchain:is_plat("windows") then
-                rtdir, rtlink = _get_llvm_compiler_win_rtdir_and_link(toolchain)
-            end
+            rtdir, rtlink, rtlib = _get_llvm_compiler_rtdir_and_link(toolchain)
         end
 
         llvm_dirs = {root = rootdir,
@@ -310,6 +311,7 @@ function get_llvm_dirs(toolchain)
         	           cxxinclude = cxxincludedir,
         	           res = resdir,
         	           rt = rtdir,
+        	           rtlib = rtlib,
         	           rtlink = rtlink }
         _g.llvm_dirs = llvm_dirs
       end

xmake/toolchains/clang/load.lua

@@ -21,6 +21,7 @@
 import("detect.sdks.find_vstudio")
 import("detect.sdks.find_mingw")
 import("core.project.config")
+import("private.utils.toolchain", {alias = "toolchain_utils"})
 
 -- add the given vs environment
 function _add_vsenv(toolchain, name, curenvs)
@@ -66,6 +67,22 @@ function main(toolchain, suffix)
         target = "armv7"
     end
 
+    local dirs = toolchain_utils.get_llvm_dirs(toolchain, toolchain:sdkdir())
+    if dirs then
+        if dirs.bin then
+            toolchain:add("runenvs", dirs.bin)
+        end
+        if dirs.lib then
+            toolchain:add("runenvs", dirs.lib)
+        end
+        if dirs.cxxlib then
+            toolchain:add("runenvs", dirs.cxxlib)
+        end
+        if dirs.rtlib then
+            toolchain:add("runenvs", dirs.rtlib)
+        end
+    end
+
     if toolchain:is_plat("windows") then
         target = target .. "-windows-msvc"
 

xmake/toolchains/llvm/xmake.lua

@@ -54,9 +54,20 @@ toolchain("llvm")
             toolchain:add("runtimes", "MT", "MTd", "MD", "MDd")
         end
 
-        local dirs = toolchain_utils.get_llvm_dirs(toolchain)
-        if dirs and dirs.rt then
-            toolchain:add("runenvs", dirs.rt)
+        local dirs = toolchain_utils.get_llvm_dirs(toolchain, toolchain:sdkdir())
+        if dirs then
+            if dirs.bin then
+                toolchain:add("runenvs", dirs.bin)
+            end
+            if dirs.lib then
+                toolchain:add("runenvs", dirs.lib)
+            end
+            if dirs.cxxlib then
+                toolchain:add("runenvs", dirs.cxxlib)
+            end
+            if dirs.rtlib then
+                toolchain:add("runenvs", dirs.rtlib)
+            end
         end
 
         -- add target flags