Merge remote-tracking branch 'upstream/master'

1 files changed, 5 insertions, 6 deletions

diff --git a/xmake/modules/core/tools/dmd.lua b/xmake/modules/core/tools/dmd.lua
index c172641ac..2a9d860e1 100644
--- a/xmake/modules/core/tools/dmd.lua
+++ b/xmake/modules/core/tools/dmd.lua
@@ -94,7 +94,7 @@ end
 
 -- make the includedir flag
 function nf_includedir(self, dir)
-    return "-I" .. os.args(dir)
+    return {"-I" .. dir}
 end
 
 -- make the sysincludedir flag
@@ -114,20 +114,19 @@ end
 
 -- make the linkdir flag
 function nf_linkdir(self, dir)
-    return "-L-L" .. os.args(dir)
+    return {"-L-L" .. dir}
 end
 
 -- make the rpathdir flag
 function nf_rpathdir(self, dir)
     dir = path.translate(dir)
     if self:has_flags("-L-rpath=" .. dir, "ldflags") then
-        return "-L-rpath=" .. os.args(dir:gsub("@[%w_]+", function (name)
+        return {"-L-rpath=" .. (dir:gsub("@[%w_]+", function (name)
             local maps = {["@loader_path"] = "$ORIGIN", ["@executable_path"] = "$ORIGIN"}
             return maps[name]
-        end))
-
+        end))}
     elseif self:has_flags("-L-rpath -L" .. dir, "ldflags") then
-        return "-L-rpath -L" .. os.args(dir:gsub("%$ORIGIN", "@loader_path"))
+        return {"-L-rpath", "-L" .. (dir:gsub("%$ORIGIN", "@loader_path"))}
     end
 end