summaryrefslogtreecommitdiff
path: root/xmake/scripts/base/config.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2015-05-16 20:00:45 +0800
committerruki <[email protected]>2015-05-16 20:00:45 +0800
commitb7344cd33b93ba1a1aa96eea057adf4b71f7139a (patch)
tree2bf15a9edab8fdce2777ca0b46d7cedf24d4fac6 /xmake/scripts/base/config.lua
parent94c489e0b0c07d8187d96ca7659357c5c71d5944 (diff)
add import for the configure file
Diffstat (limited to 'xmake/scripts/base/config.lua')
-rw-r--r--xmake/scripts/base/config.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/xmake/scripts/base/config.lua b/xmake/scripts/base/config.lua
index cb169550e..31fb4dd81 100644
--- a/xmake/scripts/base/config.lua
+++ b/xmake/scripts/base/config.lua
@@ -223,13 +223,13 @@ function config.loadxconf()
-- load and execute the xmake.xconf
local path = options.project .. "/xmake.xconf"
- local configs, errors = preprocessor.loadfile(path, "config", configures, {"target"})
-
- -- save configs
- config._CONFIGS = configs
+ local newenv, errors = preprocessor.loadfile(path, "config", configures, {"target"})
-- exists local configures?
- if configs then
+ if newenv then
+
+ -- save configs
+ config._CONFIGS = newenv._CONFIGS
-- clear configs if the host environment has been changed
local target = config.getarget()
@@ -248,7 +248,7 @@ function config.loadxconf()
-- init configs
config._CONFIGS = config._CONFIGS or {}
- configs = config._CONFIGS
+ local configs = config._CONFIGS
-- init targets
configs._TARGET = configs._TARGET or {}