add llvm rtlib

1 files changed, 11 insertions, 2 deletions

diff --git a/xmake/modules/private/utils/toolchain.lua b/xmake/modules/private/utils/toolchain.lua
index f742cf295..d687adf09 100644
--- a/xmake/modules/private/utils/toolchain.lua
+++ b/xmake/modules/private/utils/toolchain.lua
@@ -281,7 +281,7 @@ function get_llvm_dirs(toolchain)
             rootdir = _get_llvm_rootdir(toolchain)
         end
 
-        local bindir, libdir, cxxlibdir, includedir, cxxincludedir, resdir, rtdir, rtlink
+        local bindir, libdir, cxxlibdir, includedir, cxxincludedir, resdir, rtdir, rtlink, rtlib
         if rootdir then
             bindir = path.join(rootdir, "bin")
             bindir = os.isdir(bindir) and bindir or nil
@@ -321,7 +321,6 @@ function get_llvm_dirs(toolchain)
                      rtlib = rtlib,
                      rtlink = rtlink }
         memcache:set(cachekey, llvm_dirs)
-        _g.llvm_dirs = llvm_dirs
       end
       return llvm_dirs
 end
@@ -350,3 +349,13 @@ function set_llvm_runenvs(toolchain)
         end
     end
 end
+
+-- add compiler-rt for llvm
+function add_llvm_compiler_rt(toolchain)
+    local dirs = get_llvm_dirs(toolchain)
+    if dirs and dirs.rtlib and dirs.rtlink then
+        local rtlib_path = path.join(dirs.rtlib, path.filename(dirs.rtlink))
+        toolchain:add("ldflags", rtlib_path)
+        toolchain:add("shflags", rtlib_path)
+    end
+end