summaryrefslogtreecommitdiff
path: root/xmake/scripts/base
diff options
context:
space:
mode:
authorruki <[email protected]>2015-05-27 09:32:01 +0800
committerruki <[email protected]>2015-05-27 09:32:01 +0800
commit3aab30fc254ae7e9bd138aff2bb263af0d447017 (patch)
treebd9e4c95b0e0be22655238f9d51102ac0f48822f /xmake/scripts/base
parent80f92040764d0e4d6c89c5f8d82f4a8dc1b54902 (diff)
add prober to all platforms
Diffstat (limited to 'xmake/scripts/base')
-rw-r--r--xmake/scripts/base/config.lua7
-rw-r--r--xmake/scripts/base/main.lua2
2 files changed, 7 insertions, 2 deletions
diff --git a/xmake/scripts/base/config.lua b/xmake/scripts/base/config.lua
index e6b4dbfdd..bf201db4b 100644
--- a/xmake/scripts/base/config.lua
+++ b/xmake/scripts/base/config.lua
@@ -291,11 +291,16 @@ function config.loadxconf()
-- save configs
config._CONFIGS = newenv._CONFIGS
- -- clear configs if the host environment has been changed
+ -- clear configs if the host has been changed
local target = config._target()
if target and target.host ~= xmake._HOST then
config._CONFIGS = {}
end
+
+ -- clear configs if the plat has been changed
+ if target and target.plat and options.plat and target.plat ~= options.plat then
+ config._CONFIGS = {}
+ end
end
-- the target name
diff --git a/xmake/scripts/base/main.lua b/xmake/scripts/base/main.lua
index 7d448fc57..7418a625a 100644
--- a/xmake/scripts/base/main.lua
+++ b/xmake/scripts/base/main.lua
@@ -155,7 +155,7 @@ local menu =
end
return descriptions
end }
- , {'a', "arch", "kv", xmake._ARCH, "Compile for the given architecture."
+ , {'a', "arch", "kv", "auto", "Compile for the given architecture."
, function ()
local descriptions = {}
local plats = platform.plats()