summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur LAURENT <[email protected]>2024-03-07 12:12:13 +0100
committerArthur LAURENT <[email protected]>2024-03-07 12:14:18 +0100
commit252b7e5ee70d6203715d39131e34d325e55385d2 (patch)
tree3fac7cdb3f5001fd0288c87b8d1270dfeafc1d91
parent4f712dbed258b887da87334522c0b85fa4c80381 (diff)
make rpathdir clang function private
-rw-r--r--xmake/modules/core/tools/clang.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/xmake/modules/core/tools/clang.lua b/xmake/modules/core/tools/clang.lua
index 907264ce8..9c30b43c3 100644
--- a/xmake/modules/core/tools/clang.lua
+++ b/xmake/modules/core/tools/clang.lua
@@ -221,7 +221,7 @@ function _get_llvm_target_triple(self)
end
-- make the rpathdir flag
-function rpathdir(self, dir)
+function _rpathdir(self, dir)
dir = path.translate(dir)
if self:has_flags("-Wl,-rpath=" .. dir, "ldflags") then
local flags = {"-Wl,-rpath=" .. (dir:gsub("@[%w_]+", function (name)
@@ -309,13 +309,13 @@ function nf_runtime(self, runtime, opt)
maps["c++_shared"] = table.join(maps["c++_shared"], "-L" .. triple_libdir)
end
-- add rpath to avoid the user need to set LD_LIBRARY_PATH by hand
- maps["c++_shared"] = table.join(maps["c++_shared"], rpathdir(self, libdir))
+ maps["c++_shared"] = table.join(maps["c++_shared"], _rpathdir(self, libdir))
if triple_libdir then
- maps["c++_shared"] = table.join(maps["c++_shared"], rpathdir(self, triple_libdir))
+ maps["c++_shared"] = table.join(maps["c++_shared"], _rpathdir(self, triple_libdir))
end
if target:kind() == "shared" and self:is_plat("macosx", "iphoneos", "watchos") then
- table.join2(maps["c++_shared"], "-install_name")
- table.join2(maps["c++_shared"], "@rpath/" .. path.filename(target:filename()))
+ maps["c++_shared"] = table.join(maps["c++_shared"], "-install_name")
+ maps["c++_shared"] = table.join(maps["c++_shared"], "@rpath/" .. path.filename(target:filename()))
end
end
if runtime:endswith("_static") and _has_static_libstdcxx(self) then