summaryrefslogtreecommitdiff
path: root/xmake/core/base/global.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2016-02-28 15:02:36 +0800
committerruki <[email protected]>2016-02-28 15:02:36 +0800
commitdbd69a7e7263760d592bcaf2abcde8758dd82fd1 (patch)
treedbe8153f44b5c29bdacf8e2fdef46d596a6124f0 /xmake/core/base/global.lua
parent95860a08bd483a3f900ea15ba30c69faa60e01e8 (diff)
hide _DEFAULTS for option
Diffstat (limited to 'xmake/core/base/global.lua')
-rw-r--r--xmake/core/base/global.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/core/base/global.lua b/xmake/core/base/global.lua
index 2c178af71..42ba754e5 100644
--- a/xmake/core/base/global.lua
+++ b/xmake/core/base/global.lua
@@ -169,7 +169,7 @@ function global.load()
local configs = global._CONFIGS
-- xmake global?
- if options._TASK == "global" then
+ if option.task() == "global" then
-- merge option.options() to the global configure
for k, v in pairs(options) do
@@ -184,7 +184,7 @@ function global.load()
end
-- merge the default global configure options to the global configure
- local defaults = options._DEFAULTS
+ local defaults = option.defaults()
if defaults then
for k, v in pairs(defaults) do