summaryrefslogtreecommitdiff
path: root/xmake/scripts/base/main.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-10 11:51:06 +0800
committerruki <[email protected]>2015-06-10 11:51:06 +0800
commit21829afa8efa18ca57e4bd9b322c6be1f84d392d (patch)
treee3af545e1c76f83824fbd63f8f0043363252cd9f /xmake/scripts/base/main.lua
parent177400e62e74d5ad3539573cfd3143cd19d3d30f (diff)
fix merge option and config for boolean value
Diffstat (limited to 'xmake/scripts/base/main.lua')
-rw-r--r--xmake/scripts/base/main.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmake/scripts/base/main.lua b/xmake/scripts/base/main.lua
index 77db5b2de..a46c3ea81 100644
--- a/xmake/scripts/base/main.lua
+++ b/xmake/scripts/base/main.lua
@@ -163,7 +163,7 @@ function main._prepare_project()
-- merge the default options
for k, v in pairs(options._DEFAULTS) do
- if not options[k] then options[k] = v end
+ if nil == options[k] then options[k] = v end
end
-- load xmake.lua file