summaryrefslogtreecommitdiff
path: root/xmake/scripts/platform
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-03 11:56:22 +0800
committerruki <[email protected]>2015-06-03 11:56:22 +0800
commit8f5a561006bb5b0952278075deb908633317c987 (patch)
tree4a57ebf7283fd7c47b88f7c7c0aac4caa67cb607 /xmake/scripts/platform
parent648d0f6875478a5184668996f3948a0e61e862a0 (diff)
clean the cached configure
Diffstat (limited to 'xmake/scripts/platform')
-rw-r--r--xmake/scripts/platform/android/_prober.lua2
-rw-r--r--xmake/scripts/platform/iphoneos/_prober.lua4
-rw-r--r--xmake/scripts/platform/iphonesimulator/_prober.lua4
-rw-r--r--xmake/scripts/platform/linux/_prober.lua2
-rw-r--r--xmake/scripts/platform/macosx/_prober.lua4
-rw-r--r--xmake/scripts/platform/platform.lua4
-rw-r--r--xmake/scripts/platform/windows/_prober.lua2
7 files changed, 11 insertions, 11 deletions
diff --git a/xmake/scripts/platform/android/_prober.lua b/xmake/scripts/platform/android/_prober.lua
index c13b46c01..28ccc3e9f 100644
--- a/xmake/scripts/platform/android/_prober.lua
+++ b/xmake/scripts/platform/android/_prober.lua
@@ -46,7 +46,7 @@ function _prober._probe_arch(configs)
end
-- probe the configure
-function _prober.done(configs)
+function _prober.done(configs, is_global)
-- probe the architecture
if not _prober._probe_arch(configs) then return end
diff --git a/xmake/scripts/platform/iphoneos/_prober.lua b/xmake/scripts/platform/iphoneos/_prober.lua
index f62630583..f28d0a672 100644
--- a/xmake/scripts/platform/iphoneos/_prober.lua
+++ b/xmake/scripts/platform/iphoneos/_prober.lua
@@ -126,7 +126,7 @@ function _prober._probe_xcode_sdkver(configs)
end
-- probe the configure
-function _prober.done(configs)
+function _prober.done(configs, is_global)
-- probe the architecture
if not _prober._probe_arch(configs) then return end
@@ -135,7 +135,7 @@ function _prober.done(configs)
if not _prober._probe_xcode(configs) then return end
-- probe the xcode sdk version
- if not _prober._probe_xcode_sdkver(configs) then return end
+ if not is_global and not _prober._probe_xcode_sdkver(configs) then return end
end
diff --git a/xmake/scripts/platform/iphonesimulator/_prober.lua b/xmake/scripts/platform/iphonesimulator/_prober.lua
index 9e7c85202..eeb485b86 100644
--- a/xmake/scripts/platform/iphonesimulator/_prober.lua
+++ b/xmake/scripts/platform/iphonesimulator/_prober.lua
@@ -126,7 +126,7 @@ function _prober._probe_xcode_sdkver(configs)
end
-- probe the configure
-function _prober.done(configs)
+function _prober.done(configs, is_global)
-- probe the architecture
if not _prober._probe_arch(configs) then return end
@@ -135,7 +135,7 @@ function _prober.done(configs)
if not _prober._probe_xcode(configs) then return end
-- probe the xcode sdk version
- if not _prober._probe_xcode_sdkver(configs) then return end
+ if not is_global and not _prober._probe_xcode_sdkver(configs) then return end
end
diff --git a/xmake/scripts/platform/linux/_prober.lua b/xmake/scripts/platform/linux/_prober.lua
index 13cb0b52f..717bd71fe 100644
--- a/xmake/scripts/platform/linux/_prober.lua
+++ b/xmake/scripts/platform/linux/_prober.lua
@@ -46,7 +46,7 @@ function _prober._probe_arch(configs)
end
-- probe the configure
-function _prober.done(configs)
+function _prober.done(configs, is_global)
-- probe the architecture
if not _prober._probe_arch(configs) then return end
diff --git a/xmake/scripts/platform/macosx/_prober.lua b/xmake/scripts/platform/macosx/_prober.lua
index 81625af9e..9e722d4d0 100644
--- a/xmake/scripts/platform/macosx/_prober.lua
+++ b/xmake/scripts/platform/macosx/_prober.lua
@@ -126,7 +126,7 @@ function _prober._probe_xcode_sdkver(configs)
end
-- probe the configure
-function _prober.done(configs)
+function _prober.done(configs, is_global)
-- probe the architecture
if not _prober._probe_arch(configs) then return end
@@ -135,7 +135,7 @@ function _prober.done(configs)
if not _prober._probe_xcode(configs) then return end
-- probe the xcode sdk version
- if not _prober._probe_xcode_sdkver(configs) then return end
+ if not is_global and not _prober._probe_xcode_sdkver(configs) then return end
end
diff --git a/xmake/scripts/platform/platform.lua b/xmake/scripts/platform/platform.lua
index 2858018c2..4361ea42a 100644
--- a/xmake/scripts/platform/platform.lua
+++ b/xmake/scripts/platform/platform.lua
@@ -275,7 +275,7 @@ function platform.probe(configs, is_global)
for _, plat in ipairs(plats) do
local p = platform._load(plat)
if p and p._PROBER and p._PROBER.done and p._HOST and p._HOST == xmake._HOST then
- p._PROBER.done(configs)
+ p._PROBER.done(configs, is_global)
end
end
@@ -284,7 +284,7 @@ function platform.probe(configs, is_global)
-- probe it
local p = platform._load(config.get("plat"))
if p and p._PROBER and p._PROBER.done then
- p._PROBER.done(configs)
+ p._PROBER.done(configs, is_global)
end
end
end
diff --git a/xmake/scripts/platform/windows/_prober.lua b/xmake/scripts/platform/windows/_prober.lua
index 3361e8939..0eb5d0157 100644
--- a/xmake/scripts/platform/windows/_prober.lua
+++ b/xmake/scripts/platform/windows/_prober.lua
@@ -186,7 +186,7 @@ function _prober._probe_vs_path(configs)
end
-- probe the configure
-function _prober.done(configs)
+function _prober.done(configs, is_global)
-- probe the architecture
if not _prober._probe_arch(configs) then return end