diff options
| author | ruki <[email protected]> | 2017-09-28 23:44:36 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-09-28 16:27:39 +0800 |
| commit | b0c6c6c058dfe7fe21f42da4da8c8f03fbdb8951 (patch) | |
| tree | 158a4a65af66c79a3c550393eeb4d12ee3aed206 /xmake/modules/core/tools/gcc.lua | |
| parent | 603ecaeb969342384e55b1fe92ed6d55d8ea970c (diff) | |
fix compile error with space path
Diffstat (limited to 'xmake/modules/core/tools/gcc.lua')
| -rw-r--r-- | xmake/modules/core/tools/gcc.lua | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua index e011d8c68..007ce26bb 100644 --- a/xmake/modules/core/tools/gcc.lua +++ b/xmake/modules/core/tools/gcc.lua @@ -219,7 +219,7 @@ end -- make the includedir flag function nf_includedir(self, dir) - return "-I" .. dir + return "-I" .. os.args(dir) end -- make the link flag @@ -229,18 +229,18 @@ end -- make the linkdir flag function nf_linkdir(self, dir) - return "-L" .. dir + return "-L" .. os.args(dir) end -- make the rpathdir flag function nf_rpathdir(self, dir) if self:has_flags("-Wl,-rpath=" .. dir) then - return "-Wl,-rpath=" .. (dir:gsub("@[%w_]+", function (name) + return "-Wl,-rpath=" .. os.args(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("%$ORIGIN", "@loader_path")) + return "-Xlinker -rpath -Xlinker " .. os.args(dir:gsub("%$ORIGIN", "@loader_path")) end end @@ -251,16 +251,16 @@ end -- make the frameworkdir flag function nf_frameworkdir(self, frameworkdir) - return "-F " .. frameworkdir + return "-F " .. os.args(frameworkdir) end -- make the c precompiled header flag function nf_pcheader(self, pcheaderfile, target) if self:kind() == "cc" then if self:name() == "clang" then - return "-include " .. pcheaderfile .. " -include-pch " .. target:pcoutputfile("c") + return "-include " .. os.args(pcheaderfile) .. " -include-pch " .. os.args(target:pcoutputfile("c")) else - return "-include " .. pcheaderfile + return "-include " .. os.args(pcheaderfile) end end end @@ -269,9 +269,9 @@ end function nf_pcxxheader(self, pcheaderfile, target) if self:kind() == "cxx" then if self:name() == "clang" then - return "-include " .. pcheaderfile .. " -include-pch " .. target:pcoutputfile("cxx") + return "-include " .. os.args(pcheaderfile) .. " -include-pch " .. os.args(target:pcoutputfile("cxx")) else - return "-include " .. pcheaderfile + return "-include " .. os.args(pcheaderfile) end end end |
