summaryrefslogtreecommitdiff
path: root/xmake/core/tool/builder.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2017-02-06 21:56:55 +0800
committerruki <[email protected]>2017-02-06 21:56:55 +0800
commite9aa23db2437faf17ca097e891ec5a1e628865f3 (patch)
tree9c6aa8f108f84ba07e5016796a28b7b8401e0ad8 /xmake/core/tool/builder.lua
parent2c125229b2da9e9d854275ae08cd29ecf57a447d (diff)
modify linker script
Diffstat (limited to 'xmake/core/tool/builder.lua')
-rw-r--r--xmake/core/tool/builder.lua14
1 files changed, 7 insertions, 7 deletions
diff --git a/xmake/core/tool/builder.lua b/xmake/core/tool/builder.lua
index e3955756b..c529d2327 100644
--- a/xmake/core/tool/builder.lua
+++ b/xmake/core/tool/builder.lua
@@ -45,11 +45,11 @@ function builder:_tool()
return self._TOOL
end
--- get the named flags
-function builder:_namedflags()
+-- get the name flags
+function builder:_nameflags()
-- get it
- return self._NAMEDFLAGS
+ return self._NAMEFLAGS
end
-- map gcc flag to the given builder flag
@@ -131,8 +131,8 @@ function builder:_addflags_from_language(flags, target)
end
}
- -- get named flags for builder
- for _, flaginfo in ipairs(self:_namedflags()) do
+ -- get name flags for builder
+ for _, flaginfo in ipairs(self:_nameflags()) do
-- get flag info
local flagscope = flaginfo[1]
@@ -156,8 +156,8 @@ function builder:_addflags_from_language(flags, target)
apiname = apiname:sub(1, #apiname - 1)
end
- -- map named flag to real flag
- local mapper = self:_tool()[apiname]
+ -- map name flag to real flag
+ local mapper = self:_tool()["nf_" .. apiname]
if mapper then
-- add the flags