diff options
| author | ruki <[email protected]> | 2015-06-10 11:51:06 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-06-10 11:51:06 +0800 |
| commit | 21829afa8efa18ca57e4bd9b322c6be1f84d392d (patch) | |
| tree | e3af545e1c76f83824fbd63f8f0043363252cd9f /xmake/scripts/platform | |
| parent | 177400e62e74d5ad3539573cfd3143cd19d3d30f (diff) | |
fix merge option and config for boolean value
Diffstat (limited to 'xmake/scripts/platform')
| -rw-r--r-- | xmake/scripts/platform/android/prober.lua | 2 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphoneos/prober.lua | 2 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphonesimulator/prober.lua | 2 | ||||
| -rw-r--r-- | xmake/scripts/platform/linux/prober.lua | 2 | ||||
| -rw-r--r-- | xmake/scripts/platform/macosx/prober.lua | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/xmake/scripts/platform/android/prober.lua b/xmake/scripts/platform/android/prober.lua index 43863555e..c53b2db57 100644 --- a/xmake/scripts/platform/android/prober.lua +++ b/xmake/scripts/platform/android/prober.lua @@ -53,7 +53,7 @@ function prober._probe_ccache(configs) if configs.ccache and configs.__ccache then return true end -- disable? - if not configs.ccache then + if type(configs.ccache) == "boolean" and not configs.ccache then configs.__ccache = nil return true end diff --git a/xmake/scripts/platform/iphoneos/prober.lua b/xmake/scripts/platform/iphoneos/prober.lua index f1868e3a3..a9b7d63c4 100644 --- a/xmake/scripts/platform/iphoneos/prober.lua +++ b/xmake/scripts/platform/iphoneos/prober.lua @@ -133,7 +133,7 @@ function prober._probe_ccache(configs) if configs.ccache and configs.__ccache then return true end -- disable? - if not configs.ccache then + if type(configs.ccache) == "boolean" and not configs.ccache then configs.__ccache = nil return true end diff --git a/xmake/scripts/platform/iphonesimulator/prober.lua b/xmake/scripts/platform/iphonesimulator/prober.lua index 55717002e..b23490169 100644 --- a/xmake/scripts/platform/iphonesimulator/prober.lua +++ b/xmake/scripts/platform/iphonesimulator/prober.lua @@ -133,7 +133,7 @@ function prober._probe_ccache(configs) if configs.ccache and configs.__ccache then return true end -- disable? - if not configs.ccache then + if type(configs.ccache) == "boolean" and not configs.ccache then configs.__ccache = nil return true end diff --git a/xmake/scripts/platform/linux/prober.lua b/xmake/scripts/platform/linux/prober.lua index 92f670394..5916a39bb 100644 --- a/xmake/scripts/platform/linux/prober.lua +++ b/xmake/scripts/platform/linux/prober.lua @@ -53,7 +53,7 @@ function prober._probe_ccache(configs) if configs.ccache and configs.__ccache then return true end -- disable? - if not configs.ccache then + if type(configs.ccache) == "boolean" and not configs.ccache then configs.__ccache = nil return true end diff --git a/xmake/scripts/platform/macosx/prober.lua b/xmake/scripts/platform/macosx/prober.lua index fe28126c8..1acc015ff 100644 --- a/xmake/scripts/platform/macosx/prober.lua +++ b/xmake/scripts/platform/macosx/prober.lua @@ -133,7 +133,7 @@ function prober._probe_ccache(configs) if configs.ccache and configs.__ccache then return true end -- disable? - if not configs.ccache then + if type(configs.ccache) == "boolean" and not configs.ccache then configs.__ccache = nil return true end |