improve rpath for clang linux

xmake-io · Mar 7, 2024 · b4c3a3e · b4c3a3e
1 parent a6b26e0
commit b4c3a3e
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/xmake/modules/core/tools/clang.lua b/xmake/modules/core/tools/clang.lua
@@ -293,9 +293,19 @@ function nf_runtime(self, runtime, opt)
                     -- add rpath to avoid the user need to set LD_LIBRARY_PATH by hand
                     local rpath_flags
                     if self:has_flags("-Wl,-rpath=" .. libdir, "ldflags") then
-                        rpath_flags = {"-Wl,-rpath=" .. libdir}
+                        rpath_flags = {"-Wl,-rpath=" .. (libdir:gsub("@[%w_]+", function (name)
+                            local maps = {["@loader_path"] = "$ORIGIN", ["@executable_path"] = "$ORIGIN"}
+                            return maps[name]
+                        end))}
                         if triple_libdir then
-                            table.join2(rpath_flags, "-Wl,-rpath=" .. triple_libdir)
+                            table.join2(rpath_flags, "-Wl,-rpath=" .. (triple_libdir:gsub("@[%w_]+", function (name)
+                                local maps = {["@loader_path"] = "$ORIGIN", ["@executable_path"] = "$ORIGIN"}
+                                return maps[name]
+                            end)))
+                        end
+                        if self:is_plat("bsd") then
+                            -- FreeBSD ld must have "-zorigin" with "-rpath".  Otherwise, $ORIGIN is not translated and it is literal.
+                            table.insert(rpath_flags, 1, "-Wl,-zorigin")
                         end
                     elseif self:has_flags("-Xlinker -rpath -Xlinker " .. libdir, "ldflags") then
                         rpath_flags = {"-Xlinker", "-rpath", "-Xlinker", (libdir:gsub("%$ORIGIN", "@loader_path"))}