feat: enhance Windows support for shared libraries and rpath handling

1 files changed, 61 insertions, 6 deletions

diff --git a/xmake/modules/core/tools/nim.lua b/xmake/modules/core/tools/nim.lua
index 94cc0645c..6d89479ac 100644
--- a/xmake/modules/core/tools/nim.lua
+++ b/xmake/modules/core/tools/nim.lua
@@ -92,31 +92,86 @@ end
 function nf_strip(self, level)
     if self:is_plat("linux", "macosx", "bsd") then
         if level == "debug" or level == "all" then
-            return "--passL:-s"
+            return "--passL:\"-s\""
         end
     end
 end
 
 -- make the includedir flag
 function nf_includedir(self, dir)
-    return {"--passC:-I" .. path.translate(dir)}
+    return {string.format("--passC:\"-I%s\"", path.translate(dir))}
 end
 
 -- make the link flag
 function nf_link(self, lib)
     if self:is_plat("windows") then
-        return "--passL:" .. lib .. ".lib"
+        return string.format("--passL:\"%s.lib\"", lib)
     else
-        return "--passL:-l" .. lib
+        return string.format("--passL:\"-l%s\"", lib)
     end
 end
 
 -- make the linkdir flag
 function nf_linkdir(self, dir)
     if self:is_plat("windows") then
-        return {"--passL:-libpath:" .. path.translate(dir)}
+        return {string.format("--passL:\"-libpath:%s\"", path.translate(dir))}
     else
-        return {"--passL:-L" .. path.translate(dir)}
+        return {string.format("--passL:\"-L%s\"", path.translate(dir))}
+    end
+end
+
+-- make the rpathdir flag
+function nf_rpathdir(self, dir, opt)
+    if self:is_plat("windows") then
+        return
+    end
+    opt = opt or {}
+    local extra = opt.extra
+    if extra and extra.installonly then
+        return
+    end
+    dir = path.translate(dir)
+
+    -- Use --passL:"-Wl,-rpath=<dir>" to pass rpath to the linker
+    -- We use standard -Wl,-rpath for gcc/clang on linux/macosx/bsd without check mainly.
+    if self:is_plat("linux", "macosx", "bsd", "iphoneos", "android") then
+         dir = dir:gsub("([@$][%w_]+)", function (name)
+            if name == "@loader_path" or name == "@executable_path" then
+                return "\\$ORIGIN"
+            elseif name == "$ORIGIN" then
+                return "\\$ORIGIN"
+            end
+            return name
+         end)
+        local rpath = string.format("-Wl,-rpath=%s", dir)
+        local flags = {string.format("--passL:\"%s\"", rpath)}
+        if extra then
+            if extra.runpath == false and self:has_flags(string.format("--passL:\"%s,--disable-new-dtags\"", rpath), "ldflags") then
+                flags[1] = string.format("--passL:\"%s,--disable-new-dtags\"", rpath)
+            elseif extra.runpath == true and self:has_flags(string.format("--passL:\"%s,--enable-new-dtags\"", rpath), "ldflags") then
+                flags[1] = string.format("--passL:\"%s,--enable-new-dtags\"", rpath)
+            end
+        end
+        return flags
+    end
+
+    -- fallback
+    if self:has_flags(string.format("--passL:\"-Wl,-rpath=%s\"", dir), "ldflags") then
+        local flags = {string.format("--passL:\"-Wl,-rpath=%s\"", (dir:gsub("@[%w_]+", function (name)
+            local maps = { ["@loader_path"] = "$ORIGIN", ["@executable_path"] = "$ORIGIN" }
+            return maps[name]
+        end)))}
+        -- add_rpathdirs("...", {runpath = false})
+        if extra then
+            if extra.runpath == false and self:has_flags(string.format("--passL:\"-Wl,-rpath=%s,--disable-new-dtags\"", dir), "ldflags") then
+                flags[1] = string.format("--passL:\"-Wl,-rpath=%s,--disable-new-dtags\"", dir)
+            elseif extra.runpath == true and self:has_flags(string.format("--passL:\"-Wl,-rpath=%s,--enable-new-dtags\"", dir), "ldflags") then
+                flags[1] = string.format("--passL:\"-Wl,-rpath=%s,--enable-new-dtags\"", dir)
+            end
+        end
+        return flags
+    elseif self:has_flags("--passL:\"-Xlinker\" --passL:\"-rpath\" --passL:\"-Xlinker\" " .. string.format("--passL:\"%s\"", dir), "ldflags") then
+        return {"--passL:\"-Xlinker\"", "--passL:\"-rpath\"", "--passL:\"-Xlinker\"", string.format("--passL:\"%s\"", (dir:gsub("%$ORIGIN", "@loader_path")))}
     end
 end