support @loader_path and ORIGIN

1 files changed, 2 insertions, 5 deletions

diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua
index 1139bed0b..821cc77ce 100644
--- a/xmake/modules/core/tools/gcc.lua
+++ b/xmake/modules/core/tools/gcc.lua
@@ -234,16 +234,13 @@ end
 
 -- make the rpathdir flag
 function nf_rpathdir(self, dir)
-    if self:has_flags(flag_elf) then
+    if self:has_flags("-Wl,-rpath=" .. dir) then
         return "-Wl,-rpath=" .. (dir:gsub("@[%w_]+", function (name)
             local maps = {["@loader_path"] = "$ORIGIN", ["@executable_path"] = "$ORIGIN"}
             return maps[name]
         end))
     elseif self:has_flags("-Xlinker -rpath -Xlinker " .. dir) then
-        return "-Xlinker -rpath -Xlinker " .. (dir:gsub("%$[%w_]+", function (name)
-            local maps = {["$ORIGIN"] = "@loader_path"}
-            return maps[name]
-        end))
+        return "-Xlinker -rpath -Xlinker " .. (dir:gsub("%$ORIGIN", "@loader_path"))
     end
 end